From 56a04bbf739a96c34fde333fc9c9d2e8bf399fb1 Mon Sep 17 00:00:00 2001 From: izory <791736813@qq.com> Date: Mon, 27 Sep 2021 16:07:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E3=80=81?= =?UTF-8?q?=E4=BB=93=E5=82=A8=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/Controllers/BaseController.cs | 8 +- .../Controllers/CodeGeneratorController.cs | 2 +- .../Controllers/System/ArticleController.cs | 2 +- .../Controllers/System/SysDeptController.cs | 18 +- .../System/SysDictTypeController.cs | 6 +- .../Controllers/System/SysLoginController.cs | 2 +- .../Controllers/System/SysMenuController.cs | 24 +- .../Controllers/System/SysPostController.cs | 11 +- .../System/SysProfileController.cs | 8 +- .../Controllers/System/SysRoleController.cs | 18 +- .../Controllers/System/SysUserController.cs | 22 +- .../Controllers/System/TasksController.cs | 10 +- .../Controllers/System/TasksLogController.cs | 2 +- .../System/monitor/SysLogininforController.cs | 2 +- .../System/monitor/SysOperlogController.cs | 2 +- .../Controllers/UploadController.cs | 2 +- .../Controllers/business/GendemoController.cs | 2 +- ZR.Admin.WebApi/Extensions/TasksExtension.cs | 2 +- .../CodeGenTemplate/ControllersTemplate.txt | 2 +- ZR.Repository/BaseRepository.cs | 149 ++++-- ZR.Repository/DbProvider/SugarDbContext.cs | 50 -- ZR.Repository/IBaseRepository.cs | 31 +- .../Interceptor/SqlLogInterceptorAttribute.cs | 16 - ZR.Repository/System/BaseRepository.cs | 21 - ZR.Repository/System/GenTableRepository.cs | 6 +- ZR.Repository/System/SysDictDataRepository.cs | 5 +- ZR.Repository/System/SysPostRepository.cs | 4 +- ZR.Service/BaseService.cs | 504 ++++++++---------- ZR.Service/Extensions/QueryableExtension.cs | 30 -- ZR.Service/IBaseService.cs | 313 +++++------ ZR.Service/System/ArticleCategoryService.cs | 2 +- ZR.Service/System/ArticleService.cs | 2 +- ZR.Service/System/GenTableService.cs | 6 +- .../IService/IArticleCategoryService.cs | 2 +- ZR.Service/System/IService/IArticleService.cs | 2 +- ZR.Service/System/IService/ISysDeptService.cs | 18 +- ZR.Service/System/IService/ISysDictService.cs | 9 +- ZR.Service/System/IService/ISysPostService.cs | 2 +- .../System/IService/ISysTasksLogService.cs | 2 +- .../System/IService/ISysTasksQzService.cs | 4 +- ZR.Service/System/SysDeptService.cs | 18 +- ZR.Service/System/SysDictDataService.cs | 2 +- ZR.Service/System/SysDictService.cs | 14 +- ZR.Service/System/SysPostService.cs | 2 +- ZR.Service/System/SysTasksLogService.cs | 2 +- ZR.Service/System/SysTasksQzService.cs | 2 +- ZR.Vue/src/views/system/dept/index.vue | 1 + ZRAdmin.xml | 2 +- 48 files changed, 621 insertions(+), 745 deletions(-) delete mode 100644 ZR.Repository/DbProvider/SugarDbContext.cs delete mode 100644 ZR.Repository/Interceptor/SqlLogInterceptorAttribute.cs delete mode 100644 ZR.Repository/System/BaseRepository.cs diff --git a/ZR.Admin.WebApi/Controllers/BaseController.cs b/ZR.Admin.WebApi/Controllers/BaseController.cs index 119d7c4..5a318df 100644 --- a/ZR.Admin.WebApi/Controllers/BaseController.cs +++ b/ZR.Admin.WebApi/Controllers/BaseController.cs @@ -22,7 +22,7 @@ namespace ZR.Admin.WebApi.Controllers return Content(jsonStr, "application/json"); } - protected IActionResult ToRespose(ResultCode resultCode, object data = null) + protected IActionResult ToResponse(ResultCode resultCode, object data = null) { string jsonStr = GetJsonStr(GetApiResult(resultCode, data), ""); return Content(jsonStr, "application/json"); @@ -34,13 +34,13 @@ namespace ZR.Admin.WebApi.Controllers /// /// /// - protected IActionResult OutputJson(ApiResult apiResult, string timeFormatStr = "yyyy-MM-dd HH:mm:ss") + protected IActionResult ToResponse(ApiResult apiResult, string timeFormatStr = "yyyy-MM-dd HH:mm:ss") { string jsonStr = GetJsonStr(apiResult, timeFormatStr); return Content(jsonStr, "application/json"); } - protected IActionResult OutputJson(long rows, string timeFormatStr = "yyyy-MM-dd HH:mm:ss") + protected IActionResult ToResponse(long rows, string timeFormatStr = "yyyy-MM-dd HH:mm:ss") { string jsonStr = GetJsonStr(ToJson(rows), timeFormatStr); @@ -97,7 +97,7 @@ namespace ZR.Admin.WebApi.Controllers protected IActionResult CustomError(ResultCode resultCode, string msg = "") { - return OutputJson(GetApiResult(resultCode, msg)); + return ToResponse(GetApiResult(resultCode, msg)); } } } diff --git a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs index d6a4f55..df5887c 100644 --- a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs +++ b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs @@ -196,7 +196,7 @@ namespace ZR.Admin.WebApi.Controllers } } - return ToRespose(ResultCode.FAIL); + return ToResponse(ResultCode.FAIL); } /// diff --git a/ZR.Admin.WebApi/Controllers/System/ArticleController.cs b/ZR.Admin.WebApi/Controllers/System/ArticleController.cs index e175c26..0466f31 100644 --- a/ZR.Admin.WebApi/Controllers/System/ArticleController.cs +++ b/ZR.Admin.WebApi/Controllers/System/ArticleController.cs @@ -147,7 +147,7 @@ namespace ZR.Admin.WebApi.Controllers { if (id <= 0) { - return OutputJson(ApiResult.Error($"删除失败Id 不能为空")); + return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } // 删除文章 diff --git a/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs b/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs index dc99ec2..29f1fc8 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs @@ -97,10 +97,10 @@ namespace ZR.Admin.WebApi.Controllers.System { if (UserConstants.NOT_UNIQUE.Equals(DeptService.CheckDeptNameUnique(dept))) { - return OutputJson(GetApiResult(ResultCode.CUSTOM_ERROR, $"新增部门{dept.DeptName}失败，部门名称已存在")); + return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"新增部门{dept.DeptName}失败，部门名称已存在")); } dept.Create_by = User.Identity.Name; - return OutputJson(ToJson(DeptService.InsertDept(dept))); + return ToResponse(ToJson(DeptService.InsertDept(dept))); } /// @@ -115,14 +115,14 @@ namespace ZR.Admin.WebApi.Controllers.System { if (UserConstants.NOT_UNIQUE.Equals(DeptService.CheckDeptNameUnique(dept))) { - return OutputJson(GetApiResult(ResultCode.CUSTOM_ERROR, $"修改部门{dept.DeptName}失败，部门名称已存在")); + return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"修改部门{dept.DeptName}失败，部门名称已存在")); } else if (dept.ParentId.Equals(dept.DeptId)) { - return OutputJson(GetApiResult(ResultCode.CUSTOM_ERROR, $"修改部门{dept.DeptName}失败，上级部门不能是自己")); + return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"修改部门{dept.DeptName}失败，上级部门不能是自己")); } dept.Update_by = User.Identity.Name; - return OutputJson(ToJson(DeptService.UpdateDept(dept))); + return ToResponse(ToJson(DeptService.UpdateDept(dept))); } /// @@ -134,13 +134,13 @@ namespace ZR.Admin.WebApi.Controllers.System [Log(Title = "部门管理", BusinessType = BusinessType.DELETE)] public IActionResult Remove(long deptId) { - if (DeptService.GetCount(it => it.ParentId == deptId && it.DelFlag == "0") > 0) + if (DeptService.Queryable().Count(it => it.ParentId == deptId && it.DelFlag == "0") > 0) { - return OutputJson(GetApiResult(ResultCode.CUSTOM_ERROR, $"存在下级部门，不允许删除")); + return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"存在下级部门，不允许删除")); } - if (UserService.GetCount(it => it.DeptId == deptId && it.DelFlag == "0") > 0) + if (DeptService.Queryable().Count(it => it.DeptId == deptId && it.DelFlag == "0") > 0) { - return OutputJson(GetApiResult(ResultCode.CUSTOM_ERROR, $"部门存在用户，不允许删除")); + return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"部门存在用户，不允许删除")); } return SUCCESS(DeptService.Delete(deptId)); diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs index 776901d..cee2abf 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs @@ -51,7 +51,7 @@ namespace ZR.Admin.WebApi.Controllers.System [ActionPermissionFilter(Permission = "system:dict:query")] public IActionResult GetInfo(long dictId = 0) { - return SUCCESS(SysDictService(f => f.DictId == dictId)); + return SUCCESS(SysDictService.GetInfo(dictId)); } /// @@ -66,7 +66,7 @@ namespace ZR.Admin.WebApi.Controllers.System { if (UserConstants.NOT_UNIQUE.Equals(SysDictService.CheckDictTypeUnique(dict))) { - return OutputJson(ApiResult.Error($"新增字典'{dict.DictName}'失败，字典类型已存在")); + return ToResponse(ApiResult.Error($"新增字典'{dict.DictName}'失败，字典类型已存在")); } //设置添加人 dict.Create_by = HttpContext.User.Identity.Name; @@ -87,7 +87,7 @@ namespace ZR.Admin.WebApi.Controllers.System { if (UserConstants.NOT_UNIQUE.Equals(SysDictService.CheckDictTypeUnique(dict))) { - return OutputJson(ApiResult.Error($"修改字典'{dict.DictName}'失败，字典类型已存在")); + return ToResponse(ApiResult.Error($"修改字典'{dict.DictName}'失败，字典类型已存在")); } //设置添加人 dict.Update_by = HttpContext.User.Identity.Name; diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs index 08afac8..93af7f7 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs @@ -125,7 +125,7 @@ namespace ZR.Admin.WebApi.Controllers.System long uid = HttpContext.GetUId(); var menus = sysMenuService.SelectMenuTreeByUserId(uid); - return OutputJson(ToJson(1, sysMenuService.BuildMenus(menus))); + return ToResponse(ToJson(1, sysMenuService.BuildMenus(menus))); } /// diff --git a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs index aa05eaf..a6a4c29 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs @@ -94,23 +94,23 @@ namespace ZR.Admin.WebApi.Controllers.System [ActionPermissionFilter(Permission = "system:menu:edit")] public IActionResult MenuEdit([FromBody] SysMenu MenuDto) { - if (MenuDto == null) { return OutputJson(ApiResult.Error(101, "请求参数错误")); } + if (MenuDto == null) { return ToResponse(ApiResult.Error(101, "请求参数错误")); } //if (UserConstants.NOT_UNIQUE.Equals(sysMenuService.CheckMenuNameUnique(MenuDto))) //{ - // return OutputJson(ApiResult.Error($"修改菜单'{MenuDto.menuName}'失败，菜单名称已存在")); + // return ToResponse(ApiResult.Error($"修改菜单'{MenuDto.menuName}'失败，菜单名称已存在")); //} if (UserConstants.YES_FRAME.Equals(MenuDto.isFrame) && !MenuDto.path.StartsWith("http")) { - return OutputJson(ApiResult.Error($"修改菜单'{MenuDto.menuName}'失败，地址必须以http(s)://开头")); + return ToResponse(ApiResult.Error($"修改菜单'{MenuDto.menuName}'失败，地址必须以http(s)://开头")); } if (MenuDto.menuId.Equals(MenuDto.parentId)) { - return OutputJson(ApiResult.Error($"修改菜单'{MenuDto.menuName}'失败，上级菜单不能选择自己")); + return ToResponse(ApiResult.Error($"修改菜单'{MenuDto.menuName}'失败，上级菜单不能选择自己")); } MenuDto.Update_by = User.Identity.Name; int result = sysMenuService.EditMenu(MenuDto); - return OutputJson(result); + return ToResponse(result); } /// @@ -123,20 +123,20 @@ namespace ZR.Admin.WebApi.Controllers.System [ActionPermissionFilter(Permission = "system:menu:add")] public IActionResult MenuAdd([FromBody] SysMenu MenuDto) { - if (MenuDto == null) { return OutputJson(ApiResult.Error(101, "请求参数错误")); } + if (MenuDto == null) { return ToResponse(ApiResult.Error(101, "请求参数错误")); } if (UserConstants.NOT_UNIQUE.Equals(sysMenuService.CheckMenuNameUnique(MenuDto))) { - return OutputJson(ApiResult.Error($"新增菜单'{MenuDto.menuName}'失败，菜单名称已存在")); + return ToResponse(ApiResult.Error($"新增菜单'{MenuDto.menuName}'失败，菜单名称已存在")); } if (UserConstants.YES_FRAME.Equals(MenuDto.isFrame) && !MenuDto.path.StartsWith("http")) { - return OutputJson(ApiResult.Error($"新增菜单'{MenuDto.menuName}'失败，地址必须以http(s)://开头")); + return ToResponse(ApiResult.Error($"新增菜单'{MenuDto.menuName}'失败，地址必须以http(s)://开头")); } MenuDto.Create_by = User.Identity.Name; int result = sysMenuService.AddMenu(MenuDto); - return OutputJson(result); + return ToResponse(result); } /// @@ -159,7 +159,7 @@ namespace ZR.Admin.WebApi.Controllers.System } int result = sysMenuService.DeleteMenuById(menuId); - return OutputJson(result); + return ToResponse(result); } /// @@ -172,10 +172,10 @@ namespace ZR.Admin.WebApi.Controllers.System [Log(Title = "保存排序", BusinessType = BusinessType.UPDATE)] public IActionResult ChangeSort([FromBody] MenuDto MenuDto) { - if (MenuDto == null) { return OutputJson(ApiResult.Error(101, "请求参数错误")); } + if (MenuDto == null) { return ToResponse(ApiResult.Error(101, "请求参数错误")); } int result = sysMenuService.ChangeSortMenu(MenuDto); - return OutputJson(result); + return ToResponse(result); } } } diff --git a/ZR.Admin.WebApi/Controllers/System/SysPostController.cs b/ZR.Admin.WebApi/Controllers/System/SysPostController.cs index ef3da92..b573aef 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysPostController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysPostController.cs @@ -36,7 +36,7 @@ namespace ZR.Admin.WebApi.Controllers.System //开始拼装查询条件 var predicate = Expressionable.Create(); predicate = predicate.AndIF(post.Status.IfNotEmpty(), it => it.Status == post.Status); - var list = PostService.GetPages(predicate.ToExpression(), pagerInfo); + var list = PostService.GetPages(predicate.ToExpression(), pagerInfo, s => new { s.PostSort }); return SUCCESS(list); } @@ -71,8 +71,9 @@ namespace ZR.Admin.WebApi.Controllers.System { throw new CustomException($"修改岗位{post.PostName}失败，岗位编码已存在"); } - post.Update_by = User.Identity.Name; - return OutputJson(ToJson(PostService.Add(post))); + + post.Create_by = User.Identity.Name; + return ToResponse(ToJson(PostService.Add(post))); } /// @@ -94,7 +95,7 @@ namespace ZR.Admin.WebApi.Controllers.System throw new CustomException($"修改岗位{post.PostName}失败，岗位编码已存在"); } post.Update_by = User.Identity.Name; - return OutputJson(ToJson(PostService.Update(post))); + return ToResponse(ToJson(PostService.Update(post) ? 1 : 0)); } /// @@ -107,7 +108,7 @@ namespace ZR.Admin.WebApi.Controllers.System [Log(Title = "岗位删除", BusinessType = BusinessType.DELETE)] public IActionResult Delete(int id = 0) { - return OutputJson(ToJson(PostService.Delete(id))); + return ToResponse(ToJson(PostService.Delete(id))); } /// diff --git a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs index 29890f1..2ef8337 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs @@ -84,7 +84,7 @@ namespace ZR.Admin.WebApi.Controllers.System user.Update_time = DateTime.Now; int result = UserService.ChangeUser(user); - return OutputJson(result); + return ToResponse(result); } /// @@ -103,11 +103,11 @@ namespace ZR.Admin.WebApi.Controllers.System string newMd5 = NETCore.Encrypt.EncryptProvider.Md5(newPassword); if (user.Password != oldMd5) { - return OutputJson(ApiResult.Error("修改密码失败，旧密码错误")); + return ToResponse(ApiResult.Error("修改密码失败，旧密码错误")); } if (user.Password == newMd5) { - return OutputJson(ApiResult.Error("新密码不能和旧密码相同")); + return ToResponse(ApiResult.Error("新密码不能和旧密码相同")); } if (UserService.ResetPwd(loginUser.UserId, newMd5) > 0) { @@ -116,7 +116,7 @@ namespace ZR.Admin.WebApi.Controllers.System return SUCCESS(1); } - return OutputJson(ApiResult.Error("修改密码异常，请联系管理员")); + return ToResponse(ApiResult.Error("修改密码异常，请联系管理员")); } /// diff --git a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs index 7fa72fc..73a12fb 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs @@ -69,17 +69,17 @@ namespace ZR.Admin.WebApi.Controllers.System [Route("edit")] public IActionResult RoleAdd([FromBody] SysRole sysRoleDto) { - if (sysRoleDto == null) return OutputJson(ApiResult.Error(101, "请求参数错误")); + if (sysRoleDto == null) return ToResponse(ApiResult.Error(101, "请求参数错误")); if (UserConstants.NOT_UNIQUE.Equals(sysRoleService.CheckRoleKeyUnique(sysRoleDto))) { - return OutputJson(ApiResult.Error((int)ResultCode.CUSTOM_ERROR, $"新增角色'{sysRoleDto.RoleName}'失败，角色权限已存在")); + return ToResponse(ApiResult.Error((int)ResultCode.CUSTOM_ERROR, $"新增角色'{sysRoleDto.RoleName}'失败，角色权限已存在")); } sysRoleDto.Create_by = User.Identity.Name; long roleId = sysRoleService.InsertRole(sysRoleDto); - return OutputJson(ToJson(roleId)); + return ToResponse(ToJson(roleId)); } /// @@ -95,7 +95,7 @@ namespace ZR.Admin.WebApi.Controllers.System { if (sysRoleDto == null || sysRoleDto.RoleId <= 0 || string.IsNullOrEmpty(sysRoleDto.RoleKey)) { - return OutputJson(ApiResult.Error(101, "请求参数错误")); + return ToResponse(ApiResult.Error(101, "请求参数错误")); } sysRoleService.CheckRoleAllowed(sysRoleDto); var info = sysRoleService.SelectRoleById(sysRoleDto.RoleId); @@ -103,7 +103,7 @@ namespace ZR.Admin.WebApi.Controllers.System { if (UserConstants.NOT_UNIQUE.Equals(sysRoleService.CheckRoleKeyUnique(sysRoleDto))) { - return OutputJson(ApiResult.Error($"编辑角色'{sysRoleDto.RoleName}'失败，角色权限已存在")); + return ToResponse(ApiResult.Error($"编辑角色'{sysRoleDto.RoleName}'失败，角色权限已存在")); } } @@ -115,7 +115,7 @@ namespace ZR.Admin.WebApi.Controllers.System return SUCCESS(upResult); } - return OutputJson(ApiResult.Error($"修改角色'{sysRoleDto.RoleName}'失败，请联系管理员")); + return ToResponse(ApiResult.Error($"修改角色'{sysRoleDto.RoleName}'失败，请联系管理员")); } /// @@ -128,7 +128,7 @@ namespace ZR.Admin.WebApi.Controllers.System [Log(Title = "角色管理", BusinessType = BusinessType.UPDATE)] public IActionResult DataScope([FromBody] SysRole sysRoleDto) { - if (sysRoleDto == null || sysRoleDto.RoleId <= 0) return OutputJson(ApiResult.Error(101, "请求参数错误")); + if (sysRoleDto == null || sysRoleDto.RoleId <= 0) return ToResponse(ApiResult.Error(101, "请求参数错误")); sysRoleDto.Create_by = HttpContextExtension.GetName(HttpContext); //删除角色菜单 @@ -151,7 +151,7 @@ namespace ZR.Admin.WebApi.Controllers.System long[] roleIds = Tools.SpitLongArrary(roleId); int result = sysRoleService.DeleteRoleByRoleId(roleIds); - return OutputJson(ToJson(result)); + return ToResponse(ToJson(result)); } /// @@ -166,7 +166,7 @@ namespace ZR.Admin.WebApi.Controllers.System { int result = sysRoleService.UpdateRoleStatus(roleDto); - return OutputJson(ToJson(result)); + return ToResponse(ToJson(result)); } } } diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs index e309a41..91f1566 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs @@ -75,7 +75,7 @@ namespace ZR.Admin.WebApi.Controllers.System dic.Add("roleIds", RoleService.SelectUserRoles(userId)); } - return OutputJson(ApiResult.Success(dic)); + return ToResponse(ApiResult.Success(dic)); } /// @@ -88,16 +88,16 @@ namespace ZR.Admin.WebApi.Controllers.System [ActionPermissionFilter(Permission = "system:user:add")] public IActionResult AddUser([FromBody] SysUser user) { - if (user == null) { return OutputJson(ApiResult.Error(101, "请求参数错误")); } + if (user == null) { return ToResponse(ApiResult.Error(101, "请求参数错误")); } if (UserConstants.NOT_UNIQUE.Equals(UserService.CheckUserNameUnique(user.UserName))) { - return OutputJson(ApiResult.Error($"新增用户 '{user.UserName}'失败，登录账号已存在")); + return ToResponse(ApiResult.Error($"新增用户 '{user.UserName}'失败，登录账号已存在")); } user.Create_by = User.Identity.Name; user.Password = NETCore.Encrypt.EncryptProvider.Md5(user.Password); - return OutputJson(UserService.InsertUser(user)); + return ToResponse(UserService.InsertUser(user)); } /// @@ -110,12 +110,12 @@ namespace ZR.Admin.WebApi.Controllers.System [ActionPermissionFilter(Permission = "system:user:edit")] public IActionResult UpdateUser([FromBody] SysUser user) { - if (user == null || user.UserId <= 0) { return OutputJson(ApiResult.Error(101, "请求参数错误")); } + if (user == null || user.UserId <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); } user.Update_by = User.Identity.Name; int upResult = UserService.UpdateUser(user); - return OutputJson(upResult); + return ToResponse(upResult); } /// @@ -128,10 +128,10 @@ namespace ZR.Admin.WebApi.Controllers.System [ActionPermissionFilter(Permission = "system:user:update")] public IActionResult ChangeStatus([FromBody] SysUser user) { - if (user == null) { return OutputJson(ApiResult.Error(101, "请求参数错误")); } + if (user == null) { return ToResponse(ApiResult.Error(101, "请求参数错误")); } int result = UserService.ChangeUserStatus(user); - return OutputJson(ToJson(result)); + return ToResponse(ToJson(result)); } /// @@ -144,11 +144,11 @@ namespace ZR.Admin.WebApi.Controllers.System [ActionPermissionFilter(Permission = "system:user:remove")] public IActionResult Remove(int userid = 0) { - if (userid <= 0) { return OutputJson(ApiResult.Error(101, "请求参数错误")); } + if (userid <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); } int result = UserService.DeleteUser(userid); - return OutputJson(ToJson(result)); + return ToResponse(ToJson(result)); } /// @@ -164,7 +164,7 @@ namespace ZR.Admin.WebApi.Controllers.System sysUser.Password = NETCore.Encrypt.EncryptProvider.Md5(sysUser.Password); int result = UserService.ResetPwd(sysUser.UserId, sysUser.Password); - return OutputJson(ToJson(result)); + return ToResponse(ToJson(result)); } /// diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs index 541ad29..0968dfb 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs @@ -142,7 +142,7 @@ namespace ZR.Admin.WebApi.Controllers Update_by = User.Identity.Name, Update_time = DateTime.Now }); - if (response > 0) + if (response) { //先暂停原先的任务 var respon = await _schedulerServer.UpdateTaskScheduleAsync(tasksQz, tasksQz.JobGroup); @@ -177,7 +177,7 @@ namespace ZR.Admin.WebApi.Controllers { _tasksQzService.Delete(id); } - return OutputJson(taskResult); + return ToResponse(taskResult); } /// @@ -208,7 +208,7 @@ namespace ZR.Admin.WebApi.Controllers _tasksQzService.Update(tasksQz); } - return OutputJson(taskResult); + return ToResponse(taskResult); } /// @@ -239,7 +239,7 @@ namespace ZR.Admin.WebApi.Controllers _tasksQzService.Update(tasksQz); } - return OutputJson(taskResult); + return ToResponse(taskResult); } /// @@ -264,7 +264,7 @@ namespace ZR.Admin.WebApi.Controllers //_tasksQzService.Update(tasksQz); } - return OutputJson(taskResult); + return ToResponse(taskResult); } } } diff --git a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs index 432aad4..916d052 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs @@ -61,7 +61,7 @@ namespace ZR.Admin.WebApi.Controllers.System int result = tasksLogService.Delete(jobIdArr); - return OutputJson(ToJson(result, result)); + return ToResponse(ToJson(result, result)); } /// diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs index 686be34..a60033d 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs @@ -36,7 +36,7 @@ namespace ZR.Admin.WebApi.Controllers.monitor var list = sysLoginService.GetLoginLog(sysLogininfoDto, pagerInfo); var vMPage = new VMPageResult(list, pagerInfo); - return OutputJson(ToJson(vMPage.TotalNum, vMPage), TIME_FORMAT_FULL_2); + return ToResponse(ToJson(vMPage.TotalNum, vMPage), TIME_FORMAT_FULL_2); } /// diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs index e2774b2..437aaa4 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs @@ -36,7 +36,7 @@ namespace ZR.Admin.WebApi.Controllers.monitor var list = sysOperLogService.SelectOperLogList(sysOperLog, pagerInfo); var vMPage = new VMPageResult(list, pagerInfo); - return OutputJson(ToJson(vMPage.TotalNum, vMPage), TIME_FORMAT_FULL_2); + return ToResponse(ToJson(vMPage.TotalNum, vMPage), TIME_FORMAT_FULL_2); } /// diff --git a/ZR.Admin.WebApi/Controllers/UploadController.cs b/ZR.Admin.WebApi/Controllers/UploadController.cs index c05fca5..07855f7 100644 --- a/ZR.Admin.WebApi/Controllers/UploadController.cs +++ b/ZR.Admin.WebApi/Controllers/UploadController.cs @@ -43,7 +43,7 @@ namespace ZR.Admin.WebApi.Controllers } string accessPath = $"{OptionsSetting.Upload.UploadUrl}/{finalFilePath.Replace("wwwroot", "").Replace("\\", "/")}"; - return OutputJson(ToJson(1, accessPath)); + return ToResponse(ToJson(1, accessPath)); } } } diff --git a/ZR.Admin.WebApi/Controllers/business/GendemoController.cs b/ZR.Admin.WebApi/Controllers/business/GendemoController.cs index 23f6e12..a167422 100644 --- a/ZR.Admin.WebApi/Controllers/business/GendemoController.cs +++ b/ZR.Admin.WebApi/Controllers/business/GendemoController.cs @@ -127,7 +127,7 @@ namespace ZR.Admin.WebApi.Controllers public IActionResult DeleteGendemo(string ids) { int[] idsArr = Tools.SpitIntArrary(ids); - if (idsArr.Length <= 0) { return OutputJson(ApiResult.Error($"删除失败Id 不能为空")); } + if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } var response = _GendemoService.Delete(idsArr); diff --git a/ZR.Admin.WebApi/Extensions/TasksExtension.cs b/ZR.Admin.WebApi/Extensions/TasksExtension.cs index d125afa..72b8008 100644 --- a/ZR.Admin.WebApi/Extensions/TasksExtension.cs +++ b/ZR.Admin.WebApi/Extensions/TasksExtension.cs @@ -38,7 +38,7 @@ namespace ZR.Admin.WebApi.Extensions //var _tasksQzService2 = (ISysTasksQzService)services.GetRequiredService(typeof(SysTasksQzService)); ITaskSchedulerServer _schedulerServer = App.GetRequiredService(); - var tasks = _tasksQzService.GetWhere(m => m.IsStart); + var tasks = _tasksQzService.QueryableToList(m => m.IsStart); //程序启动后注册所有定时任务 foreach (var task in tasks) diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt index 24973ce..3a5d41c 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt @@ -127,7 +127,7 @@ namespace {ApiControllerNamespace}.Controllers public IActionResult Delete{ModelName}(string ids) { int[] idsArr = Tools.SpitIntArrary(ids); - if (idsArr.Length <= 0) { return OutputJson(ApiResult.Error($"删除失败Id 不能为空")); } + if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } var response = _{ModelName}Service.Delete(idsArr); diff --git a/ZR.Repository/BaseRepository.cs b/ZR.Repository/BaseRepository.cs index 0a8a13b..a4d0fab 100644 --- a/ZR.Repository/BaseRepository.cs +++ b/ZR.Repository/BaseRepository.cs @@ -1,4 +1,5 @@ using Infrastructure; +using Infrastructure.Model; using SqlSugar; using System; using System.Collections.Generic; @@ -6,6 +7,7 @@ using System.Dynamic; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; +using ZR.Model; namespace ZR.Repository { @@ -58,28 +60,41 @@ namespace ZR.Repository Console.WriteLine(); }; - base.Context = Db.GetConnection(configId);//根据类传入的ConfigId自动选择 + Context = Db.GetConnection(configId);//根据类传入的ConfigId自动选择 } } #region add + /// + /// 插入指定列使用 + /// + /// + /// + /// + /// public int Add(T parm, Expression> iClumns = null, bool ignoreNull = true) { - return base.Context.Insertable(parm).InsertColumns(iClumns).IgnoreColumns(ignoreNullColumn: ignoreNull).ExecuteCommand(); + return Context.Insertable(parm).InsertColumns(iClumns).IgnoreColumns(ignoreNullColumn: ignoreNull).ExecuteCommand(); } - public int Insert(T t, bool IgnoreNullColumn = true) + /// + /// 插入实体 + /// + /// + /// 默认忽略null列 + /// + public int Add(T t) { - return base.Context.Insertable(t).IgnoreColumns(IgnoreNullColumn).ExecuteCommand(); + return Context.Insertable(t).ExecuteCommand(); } public int InsertIgnoreNullColumn(T t) { - return base.Context.Insertable(t).IgnoreColumns(true).ExecuteCommand(); + return Context.Insertable(t).IgnoreColumns(true).ExecuteCommand(); } public int InsertIgnoreNullColumn(T t, params string[] columns) { - return base.Context.Insertable(t).IgnoreColumns(columns).ExecuteCommand(); + return Context.Insertable(t).IgnoreColumns(columns).ExecuteCommand(); } //public int Insert(SqlSugarClient client, T t) @@ -237,9 +252,9 @@ namespace ZR.Repository #region delete - public bool Delete(Expression> expression) + public bool DeleteExp(Expression> expression) { - return base.Context.Deleteable().Where(expression).ExecuteCommand() > 0; + return Context.Deleteable().Where(expression).ExecuteCommand() > 0; } //public bool Delete(PkType[] primaryKeyValues) @@ -247,47 +262,46 @@ namespace ZR.Repository // return base.Context.Deleteable().In(primaryKeyValues).ExecuteCommand() > 0; //} - public bool Delete(object[] obj) + public int Delete(object[] obj) { - return base.Context.Deleteable().In(obj).ExecuteCommand() > 0; + return Context.Deleteable().In(obj).ExecuteCommand(); } - public bool Delete(object id) + public int Delete(object id) { - return base.Context.Deleteable(id).ExecuteCommand() > 0; + return Context.Deleteable(id).ExecuteCommand(); } - public bool Delete() + public bool DeleteTable() { - return base.Context.Deleteable().ExecuteCommand() > 0; + return Context.Deleteable().ExecuteCommand() > 0; } #endregion delete #region query - public bool IsAny(Expression> expression) + public bool Any(Expression> expression) { - //base.Context.Queryable().Any(); - return base.Context.Queryable().Where(expression).Any(); + return Context.Queryable().Where(expression).Any(); } public ISugarQueryable Queryable() { - return base.Context.Queryable(); + return Context.Queryable(); } public ISugarQueryable Queryable(string tableName, string shortName) { - return base.Context.Queryable(tableName, shortName); + return Context.Queryable(tableName, shortName); } public List QueryableToList(Expression> expression) { - return base.Context.Queryable().Where(expression).ToList(); + return Context.Queryable().Where(expression).ToList(); } public Task> QueryableToListAsync(Expression> expression) { - return base.Context.Queryable().Where(expression).ToListAsync(); + return Context.Queryable().Where(expression).ToListAsync(); } //public string QueryableToJson(string select, Expression> expressionWhere) @@ -296,32 +310,27 @@ namespace ZR.Repository // return query.JilToJson(); //} - public T QueryableToEntity(Expression> expression) - { - return base.Context.Queryable().Where(expression).First(); - } - public List QueryableToList(string tableName) { - return base.Context.Queryable(tableName).ToList(); + return Context.Queryable(tableName).ToList(); } public List QueryableToList(string tableName, Expression> expression) { - return base.Context.Queryable(tableName).Where(expression).ToList(); + return Context.Queryable(tableName).Where(expression).ToList(); } public (List, int) QueryableToPage(Expression> expression, int pageIndex = 0, int pageSize = 10) { int totalNumber = 0; - var list = base.Context.Queryable().Where(expression).ToPageList(pageIndex, pageSize, ref totalNumber); + var list = Context.Queryable().Where(expression).ToPageList(pageIndex, pageSize, ref totalNumber); return (list, totalNumber); } public (List, int) QueryableToPage(Expression> expression, string order, int pageIndex = 0, int pageSize = 10) { int totalNumber = 0; - var list = base.Context.Queryable().Where(expression).OrderBy(order).ToPageList(pageIndex, pageSize, ref totalNumber); + var list = Context.Queryable().Where(expression).OrderBy(order).ToPageList(pageIndex, pageSize, ref totalNumber); return (list, totalNumber); } @@ -331,38 +340,19 @@ namespace ZR.Repository if (orderBy.Equals("DESC", StringComparison.OrdinalIgnoreCase)) { - var list = base.Context.Queryable().Where(expression).OrderBy(orderFiled, OrderByType.Desc).ToPageList(pageIndex, pageSize, ref totalNumber); + var list = Context.Queryable().Where(expression).OrderBy(orderFiled, OrderByType.Desc).ToPageList(pageIndex, pageSize, ref totalNumber); return (list, totalNumber); } else { - var list = base.Context.Queryable().Where(expression).OrderBy(orderFiled, OrderByType.Asc).ToPageList(pageIndex, pageSize, ref totalNumber); + var list = Context.Queryable().Where(expression).OrderBy(orderFiled, OrderByType.Asc).ToPageList(pageIndex, pageSize, ref totalNumber); return (list, totalNumber); } } - //public (List, int) QueryableToPage(Expression> expression, Bootstrap.BootstrapParams bootstrap) - //{ - // int totalNumber = 0; - // if (bootstrap.offset != 0) - // { - // bootstrap.offset = bootstrap.offset / bootstrap.limit + 1; - // } - // if (bootstrap.order.Equals("DESC", StringComparison.OrdinalIgnoreCase)) - // { - // var list = base.Context.Queryable().Where(expression).OrderBy(bootstrap.sort).ToPageList(bootstrap.offset, bootstrap.limit, ref totalNumber); - // return (list, totalNumber); - // } - // else - // { - // var list = base.Context.Queryable().Where(expression).OrderBy(bootstrap.sort).ToPageList(bootstrap.offset, bootstrap.limit, ref totalNumber); - // return (list, totalNumber); - // } - //} - public List SqlQueryToList(string sql, object obj = null) { - return base.Context.Ado.SqlQuery(sql, obj); + return Context.Ado.SqlQuery(sql, obj); } /// /// 获得一条数据 @@ -383,15 +373,32 @@ namespace ZR.Repository { return Context.Queryable().InSingle(pkValue); } - /// - /// 获得一条数据 + /// 根据条件查询分页数据 /// - /// string + /// + /// /// - public T GetFirst(string parm) + public PagedInfo GetPages(Expression> where, PagerInfo parm) { - return Context.Queryable().Where(parm).First(); + var source = Context.Queryable().Where(where); + + return source.ToPage(parm); + } + + public PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderEnum = "Asc") + { + var source = Context.Queryable().Where(where).OrderByIF(orderEnum == "Asc", order, OrderByType.Asc).OrderByIF(orderEnum == "Desc", order, OrderByType.Desc); + + return source.ToPage(parm); + } + /// + /// 查询所有数据(无分页,请慎用) + /// + /// + public List GetAll(bool useCache = false, int cacheSecond = 3600) + { + return Context.Queryable().WithCacheIF(useCache, cacheSecond).ToList(); } #endregion query @@ -423,9 +430,33 @@ namespace ZR.Repository // return result; //} - public string QueryableToJson(string select, Expression> expressionWhere) + //public string QueryableToJson(string select, Expression> expressionWhere) + //{ + // throw new NotImplementedException(); + //} + } + + public static class QueryableExtension + { + /// + /// 读取列表 + /// + /// + /// + /// + /// + public static PagedInfo ToPage(this ISugarQueryable source, PagerInfo parm) { - throw new NotImplementedException(); + var page = new PagedInfo(); + var total = source.Count(); + page.TotalCount = total; + page.PageSize = parm.PageSize; + page.PageIndex = parm.PageNum; + + //page.DataSource = source.OrderByIF(!string.IsNullOrEmpty(parm.Sort), $"{parm.OrderBy} {(parm.Sort == "descending" ? "desc" : "asc")}").ToPageList(parm.PageNum, parm.PageSize); + page.Result = source.ToPageList(parm.PageNum, parm.PageSize); + return page; } + } } diff --git a/ZR.Repository/DbProvider/SugarDbContext.cs b/ZR.Repository/DbProvider/SugarDbContext.cs deleted file mode 100644 index de5ff07..0000000 --- a/ZR.Repository/DbProvider/SugarDbContext.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Infrastructure; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace ZR.Repository.DbProvider -{ - /// - /// SqlSugar ORM - /// - public class SugarDbContext - { - public SqlSugarClient Db; //用来处理事务多表查询和复杂的操作 - - /// - /// 使用SugarSql获取连接对象 - /// - /// - public SugarDbContext() - { - string connStr = ConfigUtils.Instance.GetConnectionStrings(OptionsSetting.ConnAdmin); - int dbType = ConfigUtils.Instance.GetAppConfig(OptionsSetting.ConnDbType); - - Db = new SqlSugarClient(new List() - { - new ConnectionConfig(){ - ConnectionString = connStr, - DbType = (DbType)dbType, - IsAutoCloseConnection = true,//开启自动释放模式和EF原理一样 - InitKeyType = InitKeyType.Attribute,//从特性读取主键和自增列信息 - ConfigId = 0 - }, - }); - - ////调式代码 用来打印SQL - //Db.Aop.OnLogExecuting = (sql, pars) => - //{ - // Console.BackgroundColor = ConsoleColor.Yellow; - // Console.WriteLine("【SQL语句】" + sql.ToLower() + "\r\n" + Db.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value))); - //}; - ////出错打印日志 - //Db.Aop.OnError = (e) => - //{ - // Console.WriteLine($"[执行Sql出错]{e.Message}，SQL={e.Sql}"); - // Console.WriteLine(); - //}; - } - } -} diff --git a/ZR.Repository/IBaseRepository.cs b/ZR.Repository/IBaseRepository.cs index 545c46d..719eda4 100644 --- a/ZR.Repository/IBaseRepository.cs +++ b/ZR.Repository/IBaseRepository.cs @@ -1,4 +1,5 @@ -using SqlSugar; +using Infrastructure.Model; +using SqlSugar; using System; using System.Collections.Generic; using System.Data; @@ -7,6 +8,7 @@ using System.Linq; using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; +using ZR.Model; namespace ZR.Repository { @@ -14,7 +16,7 @@ namespace ZR.Repository { #region add int Add(T parm, Expression> iClumns = null, bool ignoreNull = true); - int Insert(T t, bool IgnoreNullColumn = true); + int Add(T t); int InsertIgnoreNullColumn(T t); @@ -87,21 +89,30 @@ namespace ZR.Repository #region delete - bool Delete(Expression> expression); + bool DeleteExp(Expression> expression); //bool Delete(PkType[] primaryKeyValues); - - bool Delete(object[] obj); - bool Delete(object id); - bool Delete(); + int Delete(object[] obj); + int Delete(object id); + bool DeleteTable(); #endregion delete #region query + /// + /// 根据条件查询分页数据 + /// + /// + /// + /// + PagedInfo GetPages(Expression> where, PagerInfo parm); - bool IsAny(Expression> expression); + PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderEnum = "Asc"); + + bool Any(Expression> expression); ISugarQueryable Queryable(); + List GetAll(bool useCache = false, int cacheSecond = 3600); //ISugarQueryable Queryable(string tableName, string shortName); @@ -115,8 +126,6 @@ namespace ZR.Repository List QueryableToList(string tableName); - T QueryableToEntity(Expression> expression); - List QueryableToList(string tableName, Expression> expression); (List, int) QueryableToPage(Expression> expression, int pageIndex = 0, int pageSize = 10); @@ -141,7 +150,7 @@ namespace ZR.Repository /// /// string /// - T GetFirst(string parm); + //T GetFirst(string parm); #endregion query diff --git a/ZR.Repository/Interceptor/SqlLogInterceptorAttribute.cs b/ZR.Repository/Interceptor/SqlLogInterceptorAttribute.cs deleted file mode 100644 index fe569de..0000000 --- a/ZR.Repository/Interceptor/SqlLogInterceptorAttribute.cs +++ /dev/null @@ -1,16 +0,0 @@ -using AspectCore.DynamicProxy; -using System.Threading.Tasks; -using ZR.Repository.DbProvider; - -namespace ZR.Repository.Interceptor -{ - - public class SqlLogInterceptorAttribute : AbstractInterceptorAttribute - { - public override Task Invoke(AspectContext context, AspectDelegate next) - { - global::System.Console.WriteLine(""); - return next(context); - } - } -} diff --git a/ZR.Repository/System/BaseRepository.cs b/ZR.Repository/System/BaseRepository.cs deleted file mode 100644 index cd7a790..0000000 --- a/ZR.Repository/System/BaseRepository.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Infrastructure.Attribute; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using ZR.Repository.DbProvider; - -namespace ZR.Repository.System -{ - public class BaseRepository : SugarDbContext - { - protected void PrintLog() - { - //调式代码 用来打印SQL - Db.Aop.OnLogExecuting = (sql, pars) => - { - Console.WriteLine("【SQL语句】" + sql.ToLower() + "\r\n" + Db.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value))); - }; - } - } -} diff --git a/ZR.Repository/System/GenTableRepository.cs b/ZR.Repository/System/GenTableRepository.cs index 8207ead..0ce1970 100644 --- a/ZR.Repository/System/GenTableRepository.cs +++ b/ZR.Repository/System/GenTableRepository.cs @@ -1,4 +1,5 @@ -using System; +using Infrastructure.Attribute; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -7,11 +8,12 @@ using ZR.Model.System.Generate; namespace ZR.Repository.System { + [AppService(ServiceLifetime = LifeTime.Transient)] public class GenTableRepository : BaseRepository { } - + [AppService(ServiceLifetime = LifeTime.Transient)] public class GenTableColumnRepository : BaseRepository { /// diff --git a/ZR.Repository/System/SysDictDataRepository.cs b/ZR.Repository/System/SysDictDataRepository.cs index f9830cb..110bf55 100644 --- a/ZR.Repository/System/SysDictDataRepository.cs +++ b/ZR.Repository/System/SysDictDataRepository.cs @@ -44,8 +44,7 @@ namespace ZR.Repository.System /// public long InsertDictData(SysDictData dict) { - var result = Context.Insertable(dict).IgnoreColumns(it => new { dict.Update_by }) - .ExecuteReturnIdentity(); + var result = InsertReturnBigIdentity(dict); return result; } @@ -76,7 +75,7 @@ namespace ZR.Repository.System /// public int DeleteDictDataByIds(long[] dictCodes) { - return Context.Deleteable().In(dictCodes).ExecuteCommand(); + return Delete(dictCodes); } /// diff --git a/ZR.Repository/System/SysPostRepository.cs b/ZR.Repository/System/SysPostRepository.cs index bd31ba6..cc12aa0 100644 --- a/ZR.Repository/System/SysPostRepository.cs +++ b/ZR.Repository/System/SysPostRepository.cs @@ -1,4 +1,5 @@ -using System; +using Infrastructure.Attribute; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -7,6 +8,7 @@ using ZR.Model.System; namespace ZR.Repository.System { + [AppService(ServiceLifetime = LifeTime.Transient)] public class SysPostRepository : BaseRepository { } diff --git a/ZR.Service/BaseService.cs b/ZR.Service/BaseService.cs index e9f4097..9f79143 100644 --- a/ZR.Service/BaseService.cs +++ b/ZR.Service/BaseService.cs @@ -1,12 +1,4 @@ -using Infrastructure.Attribute; -using Infrastructure.Model; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq.Expressions; -using ZR.Model; -using ZR.Repository; -using ZR.Repository.DbProvider; +using ZR.Repository; namespace ZR.Service { @@ -14,318 +6,284 @@ namespace ZR.Service /// 基础服务定义 /// /// - public class BaseService : BaseRepository where T : class,new()//, IBaseService where T : class, new() + public class BaseService : BaseRepository, IBaseService where T : class, new() { - //private readonly IBaseRepository BaseRepository; - //public BaseService(IBaseRepository baseRepository) - //{ - // BaseRepository = baseRepository; - //} - - #region 事务 - + //#region 添加操作 ///// - ///// 启用事务 + ///// 添加一条数据 ///// - //public void BeginTran() + ///// T + ///// + //public int Add(T parm) //{ - // Context.Ado.BeginTran(); + // return Add(parm);// Context.Insertable(parm).RemoveDataCache().ExecuteCommand(); //} ///// - ///// 提交事务 + ///// 添加 ///// - //public void CommitTran() - //{ - // Context.Ado.CommitTran(); - //} - - ///// - ///// 回滚事务 - ///// - //public void RollbackTran() - //{ - // Context.Ado.RollbackTran(); - //} - - #endregion - - #region 添加操作 - /// - /// 添加一条数据 - /// - /// T - /// - public int Add(T parm) - { - return base.Add(parm);// Context.Insertable(parm).RemoveDataCache().ExecuteCommand(); - } - - /// - /// 添加 - /// - /// - /// 插入列 - /// 忽略null列 - /// + ///// + ///// 插入列 + ///// 忽略null列 + ///// //public int Add(T parm, Expression> iClumns = null, bool ignoreNull = true) //{ // return Add(parm); //} - /// - /// 批量添加数据 - /// - /// List - /// - public int Add(List parm) - { - return Context.Insertable(parm).RemoveDataCache().ExecuteCommand(); - } + ///// + ///// 批量添加数据 + ///// + ///// List + ///// + //public int Add(List parm) + //{ + // return 1;// Context.Insertable(parm).RemoveDataCache().ExecuteCommand(); + //} - /// - /// 添加或更新数据，不推荐使用了 - /// - /// List - /// - public T Saveable(T parm, Expression> uClumns = null, Expression> iColumns = null) - { - var command = Context.Saveable(parm); + ///// + ///// 添加或更新数据，不推荐使用了 + ///// + ///// List + ///// + //public T Saveable(T parm, Expression> uClumns = null, Expression> iColumns = null) + //{ + // var command = Context.Saveable(parm); - if (uClumns != null) - { - command = command.UpdateIgnoreColumns(uClumns); - } + // if (uClumns != null) + // { + // command = command.UpdateIgnoreColumns(uClumns); + // } - if (iColumns != null) - { - command = command.InsertIgnoreColumns(iColumns); - } + // if (iColumns != null) + // { + // command = command.InsertIgnoreColumns(iColumns); + // } - return command.ExecuteReturnEntity(); - } + // return command.ExecuteReturnEntity(); + //} - /// - /// 批量添加或更新数据 - /// - /// List - /// - public List Saveable(List parm, Expression> uClumns = null, Expression> iColumns = null) - { - var command = Context.Saveable(parm); + ///// + ///// 批量添加或更新数据 + ///// + ///// List + ///// + //public List Saveable(List parm, Expression> uClumns = null, Expression> iColumns = null) + //{ + // var command = Context.Saveable(parm); - if (uClumns != null) - { - command = command.UpdateIgnoreColumns(uClumns); - } + // if (uClumns != null) + // { + // command = command.UpdateIgnoreColumns(uClumns); + // } - if (iColumns != null) - { - command = command.InsertIgnoreColumns(iColumns); - } + // if (iColumns != null) + // { + // command = command.InsertIgnoreColumns(iColumns); + // } - return command.ExecuteReturnList(); - } - #endregion + // return command.ExecuteReturnList(); + //} + //#endregion - #region 查询操作 + //#region 查询操作 - /// - /// 根据条件查询数据是否存在 - /// - /// 条件表达式树 - /// + ///// + ///// 根据条件查询数据是否存在 + ///// + ///// 条件表达式树 + ///// //public bool Any(Expression> where) //{ - // return base.Context.Any(where); + // return true;// base.Context.Any(where); //} - /// - /// 根据条件合计字段 - /// - /// 条件表达式树 - /// - public TResult Sum(Expression> where, Expression> field) - { - return base.Context.Queryable().Where(where).Sum(field); - } - - /// - /// 根据主值查询单条数据 - /// - /// 主键值 - /// 泛型实体 - //public T GetId(object pkValue) + ///// + ///// 根据条件合计字段 + ///// + ///// 条件表达式树 + ///// + //public TResult Sum(Expression> where, Expression> field) //{ - // return base.Context.Queryable().InSingle(pkValue); + // return base.Context.Queryable().Where(where).Sum(field); //} - /// - /// 根据主键查询多条数据 - /// - /// - /// - public List GetIn(object[] ids) - { - return Context.Queryable().In(ids).ToList(); - } + ///// + ///// 根据主值查询单条数据 + ///// + ///// 主键值 + ///// 泛型实体 + ////public T GetId(object pkValue) + ////{ + //// return base.Context.Queryable().InSingle(pkValue); + ////} - /// - /// 根据条件取条数 - /// - /// 条件表达式树 - /// - public int GetCount(Expression> where) - { - return Context.Queryable().Count(where); - - } - - /// - /// 查询所有数据(无分页,请慎用) - /// - /// - public List GetAll(bool useCache = false, int cacheSecond = 3600) - { - return Context.Queryable().WithCacheIF(useCache, cacheSecond).ToList(); - } - - /// - /// 获得一条数据 - /// - /// Expression> - /// - public T GetFirst2(Expression> where) - { - return base.GetFirst(where);// Context.Queryable().Where(where).First(); - } - - /// - /// 获得一条数据 - /// - /// string - /// - //public T GetFirst(string parm) + ///// + ///// 根据主键查询多条数据 + ///// + ///// + ///// + //public List GetIn(object[] ids) //{ - // return Context.Queryable().Where(parm).First(); + // return Context.Queryable().In(ids).ToList(); //} - /// - /// 根据条件查询分页数据 - /// - /// - /// - /// - public PagedInfo GetPages(Expression> where, PagerInfo parm) - { - var source = Context.Queryable().Where(where); + ///// + ///// 根据条件取条数 + ///// + ///// 条件表达式树 + ///// + //public int GetCount(Expression> where) + //{ + // return Context.Queryable().Count(where); - return source.ToPage(parm); - } + //} - public PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderEnum = "Asc") - { - var source = Context.Queryable().Where(where).OrderByIF(orderEnum == "Asc", order, OrderByType.Asc).OrderByIF(orderEnum == "Desc", order, OrderByType.Desc); + ///// + ///// 查询所有数据(无分页,请慎用) + ///// + ///// + //public List GetAll(bool useCache = false, int cacheSecond = 3600) + //{ + // return Context.Queryable().WithCacheIF(useCache, cacheSecond).ToList(); + //} - return source.ToPage(parm); - } + ///// + ///// 获得一条数据 + ///// + ///// Expression> + ///// + //public T GetFirst2(Expression> where) + //{ + // return base.GetFirst(where);// Context.Queryable().Where(where).First(); + //} + + ///// + ///// 获得一条数据 + ///// + ///// string + ///// + ////public T GetFirst(string parm) + ////{ + //// return Context.Queryable().Where(parm).First(); + ////} + + ///// + ///// 根据条件查询分页数据 + ///// + ///// + ///// + ///// + //public PagedInfo GetPages(Expression> where, PagerInfo parm) + //{ + // var source = Context.Queryable().Where(where); + + // return source.ToPage(parm); + //} + + //public PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderEnum = "Asc") + //{ + // var source = Context.Queryable().Where(where).OrderByIF(orderEnum == "Asc", order, OrderByType.Asc).OrderByIF(orderEnum == "Desc", order, OrderByType.Desc); + + // return source.ToPage(parm); + //} /// /// 根据条件查询数据 /// /// 条件表达式树 /// - public List GetWhere(Expression> where, bool useCache = false, int cacheSecond = 3600) - { - var query = Context.Queryable().Where(where).WithCacheIF(useCache, cacheSecond); - return query.ToList(); - } + // public List GetWhere(Expression> where, bool useCache = false, int cacheSecond = 3600) + // { + // var query = Context.Queryable().Where(where).WithCacheIF(useCache, cacheSecond); + // return query.ToList(); + // } - /// - /// 根据条件查询数据 - /// - /// 条件表达式树 - /// - public List GetWhere(Expression> where, Expression> order, string orderEnum = "Asc", bool useCache = false, int cacheSecond = 3600) - { - var query = Context.Queryable().Where(where).OrderByIF(orderEnum == "Asc", order, OrderByType.Asc).OrderByIF(orderEnum == "Desc", order, OrderByType.Desc).WithCacheIF(useCache, cacheSecond); - return query.ToList(); - } - - #endregion - - #region 修改操作 - - ///// - ///// 修改一条数据 + // /// + ///// 根据条件查询数据 ///// - ///// T + ///// 条件表达式树 ///// - //public int Update(T parm) + // public List GetWhere(Expression> where, Expression> order, string orderEnum = "Asc", bool useCache = false, int cacheSecond = 3600) + // { + // var query = Context.Queryable().Where(where).OrderByIF(orderEnum == "Asc", order, OrderByType.Asc).OrderByIF(orderEnum == "Desc", order, OrderByType.Desc).WithCacheIF(useCache, cacheSecond); + // return query.ToList(); + // } + + // #endregion + + //#region 修改操作 + + /////// + /////// 修改一条数据 + /////// + /////// T + /////// + ////public int Update(T parm) + ////{ + //// return Context.Updateable(parm).RemoveDataCache().ExecuteCommand(); + ////} + + /////// + /////// 批量修改 + /////// + /////// T + /////// + ////public int Update(List parm) + ////{ + //// return Context.Updateable(parm).RemoveDataCache().ExecuteCommand(); + ////} + + /////// + /////// 按查询条件更新 + /////// + /////// + /////// + /////// + ////public int Update(Expression> where, Expression> columns) + ////{ + //// return Context.Updateable().SetColumns(columns).Where(where).RemoveDataCache().ExecuteCommand(); + ////} + + //#endregion + + //#region 删除操作 + + /////// + /////// 删除一条或多条数据 + /////// + /////// string + /////// + ////public int Delete(object id) + ////{ + //// return Context.Deleteable(id).RemoveDataCache().ExecuteCommand(); + ////} + + /////// + /////// 删除一条或多条数据 + /////// + /////// string + /////// + ////public int Delete(object[] ids) + ////{ + //// return Context.Deleteable().In(ids).RemoveDataCache().ExecuteCommand(); + ////} + + /////// + /////// 根据条件删除一条或多条数据 + /////// + /////// 过滤条件 + /////// + ////public int Delete(Expression> where) + ////{ + //// return Context.Deleteable().Where(where).RemoveDataCache().ExecuteCommand(); + ////} + + //public int DeleteTable() //{ - // return Context.Updateable(parm).RemoveDataCache().ExecuteCommand(); + // return Context.Deleteable().RemoveDataCache().ExecuteCommand(); //} - - ///// - ///// 批量修改 - ///// - ///// T - ///// - //public int Update(List parm) - //{ - // return Context.Updateable(parm).RemoveDataCache().ExecuteCommand(); - //} - - ///// - ///// 按查询条件更新 - ///// - ///// - ///// - ///// - //public int Update(Expression> where, Expression> columns) - //{ - // return Context.Updateable().SetColumns(columns).Where(where).RemoveDataCache().ExecuteCommand(); - //} - - #endregion - - #region 删除操作 - - ///// - ///// 删除一条或多条数据 - ///// - ///// string - ///// - //public int Delete(object id) - //{ - // return Context.Deleteable(id).RemoveDataCache().ExecuteCommand(); - //} - - ///// - ///// 删除一条或多条数据 - ///// - ///// string - ///// - //public int Delete(object[] ids) - //{ - // return Context.Deleteable().In(ids).RemoveDataCache().ExecuteCommand(); - //} - - ///// - ///// 根据条件删除一条或多条数据 - ///// - ///// 过滤条件 - ///// - //public int Delete(Expression> where) - //{ - // return Context.Deleteable().Where(where).RemoveDataCache().ExecuteCommand(); - //} - - public int DeleteTable() - { - return Context.Deleteable().RemoveDataCache().ExecuteCommand(); - } - #endregion + //#endregion } } diff --git a/ZR.Service/Extensions/QueryableExtension.cs b/ZR.Service/Extensions/QueryableExtension.cs index 1bf1a23..d87b195 100644 --- a/ZR.Service/Extensions/QueryableExtension.cs +++ b/ZR.Service/Extensions/QueryableExtension.cs @@ -11,31 +11,6 @@ namespace ZR.Service { public static class QueryableExtension { - /// - /// 读取列表 - /// - /// - /// - /// - /// - /// - //public static async Task> ToPageAsync(this ISugarQueryable source, PageParm parm) - //{ - // var page = new PagedInfo(); - // var total = await source.CountAsync(); - // page.TotalCount = total; - // page.TotalPages = total / parm.PageSize; - - // if (total % parm.PageSize > 0) - // page.TotalPages++; - - // page.PageSize = parm.PageSize; - // page.PageIndex = parm.PageIndex; - - // page.DataSource = await source.OrderByIF(!string.IsNullOrEmpty(parm.Sort), $"{parm.OrderBy} {(parm.Sort == "descending" ? "desc" : "asc")}").ToPageListAsync(parm.PageIndex, parm.PageSize); - // return page; - //} - /// /// 读取列表 /// @@ -49,11 +24,6 @@ namespace ZR.Service var page = new PagedInfo(); var total = source.Count(); page.TotalCount = total; - //page.TotalPage = total / parm.PageSize; - - //if (total % parm.PageSize > 0) - // page.TotalPages++; - page.PageSize = parm.PageSize; page.PageIndex = parm.PageNum; diff --git a/ZR.Service/IBaseService.cs b/ZR.Service/IBaseService.cs index 13f602e..3e0b4ba 100644 --- a/ZR.Service/IBaseService.cs +++ b/ZR.Service/IBaseService.cs @@ -3,6 +3,7 @@ using SqlSugar; using System; using System.Collections.Generic; using System.Linq.Expressions; +using ZR.Repository; namespace ZR.Service { @@ -10,221 +11,199 @@ namespace ZR.Service /// 基础服务定义 /// /// - public interface IBaseService where T : class + public interface IBaseService : IBaseRepository where T : class, new() { - - #region 事务 - - ///// - ///// 启用事务 - ///// - //void BeginTran(); - - - ///// - ///// 提交事务 - ///// - //void CommitTran(); - - - ///// - ///// 回滚事务 - ///// - //void RollbackTran(); - - #endregion - #region 添加操作 /// /// 添加一条数据 /// /// /// - int Add(T parm); + //int Add(T parm); - int Add(T parm, Expression> iClumns = null, bool ignoreNull = false); + //int Add(T parm, Expression> iClumns = null, bool ignoreNull = false); - /// - /// 批量添加数据 - /// - /// List - /// - int Add(List parm); + ///// + ///// 批量添加数据 + ///// + ///// List + ///// + //int Add(List parm); - /// - /// 添加或更新数据 - /// - /// - /// - T Saveable(T parm, Expression> uClumns = null, Expression> iColumns = null); + ///// + ///// 添加或更新数据 + ///// + ///// + ///// + //T Saveable(T parm, Expression> uClumns = null, Expression> iColumns = null); - /// - /// 批量添加或更新数据 - /// - /// List - /// - List Saveable(List parm, Expression> uClumns = null, Expression> iColumns = null); + ///// + ///// 批量添加或更新数据 + ///// + ///// List + ///// + //List Saveable(List parm, Expression> uClumns = null, Expression> iColumns = null); - #endregion + //#endregion - #region 查询操作 + //#region 查询操作 - /// - /// 根据条件查询数据是否存在 - /// - /// 条件表达式树 - /// - bool Any(Expression> where); + ///// + ///// 根据条件查询数据是否存在 + ///// + ///// 条件表达式树 + ///// + //bool Any(Expression> where); - /// - /// 根据条件合计字段 - /// - /// 条件表达式树 - /// - TResult Sum(Expression> where, Expression> field); + ///// + ///// 根据条件合计字段 + ///// + ///// 条件表达式树 + ///// + //TResult Sum(Expression> where, Expression> field); - /// - /// 根据主值查询单条数据 - /// - /// 主键值 - /// 泛型实体 - T GetId(object pkValue); + ///// + ///// 根据主值查询单条数据 + ///// + ///// 主键值 + ///// 泛型实体 + //T GetId(object pkValue); - /// - /// 根据主键查询多条数据 - /// - /// - /// - List GetIn(object[] ids); + ///// + ///// 根据主键查询多条数据 + ///// + ///// + ///// + //List GetIn(object[] ids); - /// - /// 根据条件取条数 - /// - /// 条件表达式树 - /// - int GetCount(Expression> where); + ///// + ///// 根据条件取条数 + ///// + ///// 条件表达式树 + ///// + //int GetCount(Expression> where); - /// - /// 查询所有数据(无分页,请慎用) - /// - /// - List GetAll(bool useCache = false, int cacheSecond = 3600); + ///// + ///// 查询所有数据(无分页,请慎用) + ///// + ///// + //List GetAll(bool useCache = false, int cacheSecond = 3600); - /// - /// 获得一条数据 - /// - /// Expression> - /// - T GetFirst(Expression> where); + ///// + ///// 获得一条数据 + ///// + ///// Expression> + ///// + //T GetFirst(Expression> where); - /// - /// 获得一条数据 - /// - /// string - /// - T GetFirst(string parm); + ///// + ///// 获得一条数据 + ///// + ///// string + ///// + //T GetFirst(string parm); - /// - /// 根据条件查询分页数据 - /// - /// - /// - /// - PagedInfo GetPages(Expression> where, Model.PagerInfo parm); + ///// + ///// 根据条件查询分页数据 + ///// + ///// + ///// + ///// + //PagedInfo GetPages(Expression> where, Model.PagerInfo parm); - /// - /// 根据条件查询分页 - /// - /// - /// - /// - /// - /// - PagedInfo GetPages(Expression> where, Model.PagerInfo parm, Expression> order, string orderEnum = "Asc"); + ///// + ///// 根据条件查询分页 + ///// + ///// + ///// + ///// + ///// + ///// + //PagedInfo GetPages(Expression> where, Model.PagerInfo parm, Expression> order, string orderEnum = "Asc"); - /// - /// 根据条件查询数据 - /// - /// 条件表达式树 - /// - List GetWhere(Expression> where, bool useCache = false, int cacheSecond = 3600); + ///// + ///// 根据条件查询数据 + ///// + ///// 条件表达式树 + ///// + ////List GetWhere(Expression> where, bool useCache = false, int cacheSecond = 3600); - /// - /// 根据条件查询数据 - /// - /// 条件表达式树 - /// - List GetWhere(Expression> where, Expression> order, string orderEnum = "Asc", bool useCache = false, int cacheSecond = 3600); + /////// + /////// 根据条件查询数据 + /////// + /////// 条件表达式树 + /////// + ////List GetWhere(Expression> where, Expression> order, string orderEnum = "Asc", bool useCache = false, int cacheSecond = 3600); - #endregion + //#endregion - #region 修改操作 + //#region 修改操作 - /// - /// 修改一条数据 - /// - /// T - /// - int Update(T parm); + ///// + ///// 修改一条数据 + ///// + ///// T + ///// + //int Update(T parm); - /// - /// 批量修改 - /// - /// T - /// - int Update(List parm); + ///// + ///// 批量修改 + ///// + ///// T + ///// + //int Update(List parm); - /// - /// 按查询条件更新 - /// - /// - /// - /// - int Update(Expression> where, Expression> columns); + ///// + ///// 按查询条件更新 + ///// + ///// + ///// + ///// + //int Update(Expression> where, Expression> columns); - #endregion + //#endregion - #region 删除操作 + //#region 删除操作 - /// - /// 删除一条或多条数据 - /// - /// string - /// - int Delete(object id); + ///// + ///// 删除一条或多条数据 + ///// + ///// string + ///// + //int Delete(object id); - /// - /// 删除一条或多条数据 - /// - /// string - /// - int Delete(object[] ids); + ///// + ///// 删除一条或多条数据 + ///// + ///// string + ///// + //int Delete(object[] ids); - /// - /// 根据条件删除一条或多条数据 - /// - /// 过滤条件 - /// - int Delete(Expression> where); - - /// - /// 清空表 - /// - /// - int DeleteTable(); + ///// + ///// 根据条件删除一条或多条数据 + ///// + ///// 过滤条件 + ///// + //int Delete(Expression> where); + + ///// + ///// 清空表 + ///// + ///// + //int DeleteTable(); #endregion } diff --git a/ZR.Service/System/ArticleCategoryService.cs b/ZR.Service/System/ArticleCategoryService.cs index 8df3251..7ef4573 100644 --- a/ZR.Service/System/ArticleCategoryService.cs +++ b/ZR.Service/System/ArticleCategoryService.cs @@ -10,7 +10,7 @@ namespace ZR.Service.System /// 文章目录 /// [AppService(ServiceType = typeof(IArticleCategoryService), ServiceLifetime = LifeTime.Transient)] - public class ArticleCategoryService : IArticleCategoryService + public class ArticleCategoryService : BaseService, IArticleCategoryService { /// /// 构建前端所需要树结构 diff --git a/ZR.Service/System/ArticleService.cs b/ZR.Service/System/ArticleService.cs index 2cee43b..863efa9 100644 --- a/ZR.Service/System/ArticleService.cs +++ b/ZR.Service/System/ArticleService.cs @@ -8,7 +8,7 @@ namespace ZR.Service.System /// /// [AppService(ServiceType = typeof(IArticleService), ServiceLifetime = LifeTime.Transient)] - public class ArticleService : IArticleService + public class ArticleService : BaseService
, IArticleService { } diff --git a/ZR.Service/System/GenTableService.cs b/ZR.Service/System/GenTableService.cs index 4e6d99e..14830c9 100644 --- a/ZR.Service/System/GenTableService.cs +++ b/ZR.Service/System/GenTableService.cs @@ -67,11 +67,7 @@ namespace ZR.Service.System var predicate = Expressionable.Create(); predicate = predicate.AndIF(genTable.TableName.IfNotEmpty(), it => it.TableName.Contains(genTable.TableName)); - (List, int) ts = GenTableRepository.QueryableToPage(predicate.ToExpression(), pagerInfo.PageNum, pagerInfo.PageSize); - - PagedInfo pagedInfo = new(ts.Item1, pagerInfo.PageNum, pagerInfo.PageSize); - pagedInfo.TotalCount = ts.Item2; - return pagedInfo; + return GenTableRepository.GetPages(predicate.ToExpression(), pagerInfo); } /// diff --git a/ZR.Service/System/IService/IArticleCategoryService.cs b/ZR.Service/System/IService/IArticleCategoryService.cs index 57c7427..602b228 100644 --- a/ZR.Service/System/IService/IArticleCategoryService.cs +++ b/ZR.Service/System/IService/IArticleCategoryService.cs @@ -7,7 +7,7 @@ using ZR.Model.System; namespace ZR.Service.System.IService { - public interface IArticleCategoryService //: IBaseService + public interface IArticleCategoryService : IBaseService { List BuildCategoryTree(List categories); } diff --git a/ZR.Service/System/IService/IArticleService.cs b/ZR.Service/System/IService/IArticleService.cs index cbfa13f..0f4e7de 100644 --- a/ZR.Service/System/IService/IArticleService.cs +++ b/ZR.Service/System/IService/IArticleService.cs @@ -8,7 +8,7 @@ using ZR.Model.System; namespace ZR.Service.System.IService { - public interface IArticleService //: IBaseService
+ public interface IArticleService : IBaseService
{ } diff --git a/ZR.Service/System/IService/ISysDeptService.cs b/ZR.Service/System/IService/ISysDeptService.cs index 1dc6b77..7a381f6 100644 --- a/ZR.Service/System/IService/ISysDeptService.cs +++ b/ZR.Service/System/IService/ISysDeptService.cs @@ -6,15 +6,15 @@ using ZR.Model.Vo.System; namespace ZR.Service.System.IService { - public interface ISysDeptService //: IBaseService + public interface ISysDeptService : IBaseService { - public List GetSysDepts(SysDept dept); - public string CheckDeptNameUnique(SysDept dept); - public int InsertDept(SysDept dept); - public int UpdateDept(SysDept dept); - public void UpdateDeptChildren(long deptId, string newAncestors, string oldAncestors); - public List GetChildrenDepts(List depts, long deptId); - public List BuildDeptTree(List depts); - public List BuildDeptTreeSelect(List depts); + List GetSysDepts(SysDept dept); + string CheckDeptNameUnique(SysDept dept); + int InsertDept(SysDept dept); + int UpdateDept(SysDept dept); + void UpdateDeptChildren(long deptId, string newAncestors, string oldAncestors); + List GetChildrenDepts(List depts, long deptId); + List BuildDeptTree(List depts); + List BuildDeptTreeSelect(List depts); } } diff --git a/ZR.Service/System/IService/ISysDictService.cs b/ZR.Service/System/IService/ISysDictService.cs index 28d77cd..a6bd282 100644 --- a/ZR.Service/System/IService/ISysDictService.cs +++ b/ZR.Service/System/IService/ISysDictService.cs @@ -8,7 +8,7 @@ namespace ZR.Service.System.IService /// /// /// - public interface ISysDictService : IBaseService + public interface ISysDictService { public List SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager); @@ -39,5 +39,12 @@ namespace ZR.Service.System.IService /// /// public int UpdateDictType(SysDictType sysDictType); + + /// + /// 获取字典信息 + /// + /// + /// + SysDictType GetInfo(long dictId); } } diff --git a/ZR.Service/System/IService/ISysPostService.cs b/ZR.Service/System/IService/ISysPostService.cs index 6230e23..e8d0abf 100644 --- a/ZR.Service/System/IService/ISysPostService.cs +++ b/ZR.Service/System/IService/ISysPostService.cs @@ -6,7 +6,7 @@ using ZR.Repository; namespace ZR.Service.System.IService { - public interface ISysPostService: IBaseRepository + public interface ISysPostService : IBaseService { string CheckPostNameUnique(SysPost sysPost); string CheckPostCodeUnique(SysPost sysPost); diff --git a/ZR.Service/System/IService/ISysTasksLogService.cs b/ZR.Service/System/IService/ISysTasksLogService.cs index c5885e7..cf0f16e 100644 --- a/ZR.Service/System/IService/ISysTasksLogService.cs +++ b/ZR.Service/System/IService/ISysTasksLogService.cs @@ -3,7 +3,7 @@ using ZR.Repository; namespace ZR.Service.System.IService { - public interface ISysTasksLogService: IBaseRepository + public interface ISysTasksLogService : IBaseService { /// /// 记录任务执行日志 diff --git a/ZR.Service/System/IService/ISysTasksQzService.cs b/ZR.Service/System/IService/ISysTasksQzService.cs index d3df7a1..e7e0257 100644 --- a/ZR.Service/System/IService/ISysTasksQzService.cs +++ b/ZR.Service/System/IService/ISysTasksQzService.cs @@ -7,8 +7,8 @@ using ZR.Model.System; namespace ZR.Service.System.IService { - public interface ISysTasksQzService + public interface ISysTasksQzService : IBaseService { - SysTasksQz GetId(object id); + //SysTasksQz GetId(object id); } } diff --git a/ZR.Service/System/SysDeptService.cs b/ZR.Service/System/SysDeptService.cs index fb6dbc5..c2b56aa 100644 --- a/ZR.Service/System/SysDeptService.cs +++ b/ZR.Service/System/SysDeptService.cs @@ -18,7 +18,7 @@ namespace ZR.Service.System /// 部门管理 /// [AppService(ServiceType = typeof(ISysDeptService), ServiceLifetime = LifeTime.Transient)] - public class SysDeptService :ISysDeptService + public class SysDeptService : BaseService, ISysDeptService { public SysDeptRepository DeptRepository; @@ -76,7 +76,7 @@ namespace ZR.Service.System } dept.Ancestors = info.Ancestors + "," + dept.ParentId; - return DeptRepository.Insert(dept, true); + return DeptRepository.Add(dept); } /// @@ -86,8 +86,8 @@ namespace ZR.Service.System /// public int UpdateDept(SysDept dept) { - SysDept newParentDept = DeptRepository.GetSingle(it => it.ParentId == dept.ParentId); - SysDept oldDept = DeptRepository.GetSingle(m => m.DeptId == dept.DeptId); + SysDept newParentDept = DeptRepository.GetFirst(it => it.ParentId == dept.ParentId); + SysDept oldDept = DeptRepository.GetFirst(m => m.DeptId == dept.DeptId); if (newParentDept != null && oldDept != null) { string newAncestors = newParentDept.Ancestors + "," + newParentDept.DeptId; @@ -129,12 +129,10 @@ namespace ZR.Service.System foreach (var child in children) { child.Ancestors = child.Ancestors.Replace(oldAncestors, newAncestors); - - if (child.DeptId.Equals(deptId)) - { - //TODO Saveable(child, it => new { it.Ancestors }); - //DeptRepository.UdateDeptChildren(child); - } + } + if (children.Count > 0) + { + //DeptRepository.UdateDeptChildren(child); } } diff --git a/ZR.Service/System/SysDictDataService.cs b/ZR.Service/System/SysDictDataService.cs index e52501c..900341d 100644 --- a/ZR.Service/System/SysDictDataService.cs +++ b/ZR.Service/System/SysDictDataService.cs @@ -37,7 +37,7 @@ namespace ZR.Service.System public List SelectDictDataByType(string dictType) { string CK = $"SelectDictDataByType_{dictType}"; - if (!(CacheHelper.GetCache(CK) is List list)) + if (CacheHelper.GetCache(CK) is not List list) { list = SysDictDataRepository.SelectDictDataByType(dictType); CacheHelper.SetCache(CK, list, 30); diff --git a/ZR.Service/System/SysDictService.cs b/ZR.Service/System/SysDictService.cs index fb72f93..96a3395 100644 --- a/ZR.Service/System/SysDictService.cs +++ b/ZR.Service/System/SysDictService.cs @@ -13,7 +13,7 @@ namespace ZR.Service.System /// 字典类型 /// [AppService(ServiceType = typeof(ISysDictService), ServiceLifetime = LifeTime.Transient)] - public class SysDictService : BaseService, ISysDictService + public class SysDictService : ISysDictService { private SysDictRepository DictRepository; private SysDictDataRepository DictDataRepository; @@ -79,7 +79,7 @@ namespace ZR.Service.System /// public long InsertDictType(SysDictType sysDictType) { - return DictRepository.InsertReturnEntity(sysDictType).DictId; + return DictRepository.InsertReturnBigIdentity(sysDictType); } /// @@ -97,5 +97,15 @@ namespace ZR.Service.System } return DictRepository.UpdateDictType(sysDictType); } + + /// + /// 获取字典信息 + /// + /// + /// + public SysDictType GetInfo(long dictId) + { + return DictRepository.GetFirst(f => f.DictId == dictId); + } } } diff --git a/ZR.Service/System/SysPostService.cs b/ZR.Service/System/SysPostService.cs index b32957c..5a5e977 100644 --- a/ZR.Service/System/SysPostService.cs +++ b/ZR.Service/System/SysPostService.cs @@ -13,7 +13,7 @@ namespace ZR.Service.System /// 岗位管理 /// [AppService(ServiceType = typeof(ISysPostService), ServiceLifetime = LifeTime.Transient)] - public class SysPostService : BaseRepository, ISysPostService + public class SysPostService : BaseService, ISysPostService { public SysPostRepository PostRepository; public SysPostService(SysPostRepository postRepository) diff --git a/ZR.Service/System/SysTasksLogService.cs b/ZR.Service/System/SysTasksLogService.cs index e4539c7..7b7ae0d 100644 --- a/ZR.Service/System/SysTasksLogService.cs +++ b/ZR.Service/System/SysTasksLogService.cs @@ -28,7 +28,7 @@ namespace ZR.Service.System logModel.CreateTime = DateTime.Now; } - Insert(logModel, true); + Add(logModel); return logModel; } } diff --git a/ZR.Service/System/SysTasksQzService.cs b/ZR.Service/System/SysTasksQzService.cs index 9645e58..1569287 100644 --- a/ZR.Service/System/SysTasksQzService.cs +++ b/ZR.Service/System/SysTasksQzService.cs @@ -5,7 +5,7 @@ using ZR.Service.System.IService; namespace ZR.Service.System { [AppService(ServiceType = typeof(ISysTasksQzService), ServiceLifetime = LifeTime.Transient)] - public class SysTasksQzService : ISysTasksQzService + public class SysTasksQzService : BaseService, ISysTasksQzService { } diff --git a/ZR.Vue/src/views/system/dept/index.vue b/ZR.Vue/src/views/system/dept/index.vue index ce82cc5..759b8a9 100644 --- a/ZR.Vue/src/views/system/dept/index.vue +++ b/ZR.Vue/src/views/system/dept/index.vue @@ -24,6 +24,7 @@ + diff --git a/ZRAdmin.xml b/ZRAdmin.xml index 163b916..22d0f72 100644 --- a/ZRAdmin.xml +++ b/ZRAdmin.xml @@ -4,7 +4,7 @@ ZR.Admin.WebApi - + json输出带时间格式的