From 241fe556339da4e5fe6e5c45846a980f08ef9c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Wed, 21 Sep 2022 21:43:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=93=E5=82=A8=E3=80=81Se?= =?UTF-8?q?rvice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Repository/BaseRepository.cs | 5 +- ZR.Repository/IBaseRepository.cs | 1 + ZR.Repository/System/ArticleRepository.cs | 29 -------- ZR.Repository/System/SysDeptRepository.cs | 25 ------- ZR.Repository/System/SysFileRepository.cs | 21 ------ ZR.Repository/System/SysUserRepository.cs | 26 ++++++- ZR.Repository/System/SysUserRoleRepository.cs | 40 ---------- ZR.Repository/ZR.Repository.csproj | 23 +++++- ZR.Service/System/ArticleCategoryService.cs | 16 +--- ZR.Service/System/CommonLangService.cs | 17 +---- ZR.Service/System/GenTableService.cs | 63 +++++++++------- ZR.Service/System/IService/ISysDeptService.cs | 10 ++- .../System/IService/ISysDictDataService.cs | 9 +-- .../System/IService/ISysUserRoleService.cs | 12 +-- ZR.Service/System/SysConfigService.cs | 9 +-- ZR.Service/System/SysDeptService.cs | 37 ++++++---- ZR.Service/System/SysDictDataService.cs | 73 ++++++++++++++----- ZR.Service/System/SysDictService.cs | 48 ++++++------ ZR.Service/System/SysLoginService.cs | 35 +++++---- ZR.Service/System/SysNoticeService.cs | 11 +-- ZR.Service/System/SysOperLogService.cs | 36 ++++----- ZR.Service/System/SysPostService.cs | 16 +--- ZR.Service/System/SysRoleService.cs | 1 - ZR.Service/System/SysUserPostService.cs | 33 +++++---- ZR.Service/System/SysUserRoleService.cs | 22 +++--- 25 files changed, 286 insertions(+), 332 deletions(-) delete mode 100644 ZR.Repository/System/ArticleRepository.cs delete mode 100644 ZR.Repository/System/SysFileRepository.cs diff --git a/ZR.Repository/BaseRepository.cs b/ZR.Repository/BaseRepository.cs index 16abe27..84ca0f7 100644 --- a/ZR.Repository/BaseRepository.cs +++ b/ZR.Repository/BaseRepository.cs @@ -203,7 +203,10 @@ namespace ZR.Repository { return Context.Deleteable().ExecuteCommand(); } - + public bool Truncate() + { + return Context.DbMaintenance.TruncateTable(); + } #endregion delete #region query diff --git a/ZR.Repository/IBaseRepository.cs b/ZR.Repository/IBaseRepository.cs index 6604d2a..25aa897 100644 --- a/ZR.Repository/IBaseRepository.cs +++ b/ZR.Repository/IBaseRepository.cs @@ -50,6 +50,7 @@ namespace ZR.Repository int Delete(object[] obj); int Delete(object id); int DeleteTable(); + bool Truncate(); #endregion delete diff --git a/ZR.Repository/System/ArticleRepository.cs b/ZR.Repository/System/ArticleRepository.cs deleted file mode 100644 index 718735e..0000000 --- a/ZR.Repository/System/ArticleRepository.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Infrastructure.Attribute; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using ZR.Model.System.Dto; -using ZR.Model.System; - -namespace ZR.Repository.System -{ - /// - /// 文章管理 - /// - [AppService(ServiceLifetime = LifeTime.Transient)] - public class ArticleRepository : BaseRepository
- { - - } - - /// - /// 文章目录 - /// - [AppService(ServiceLifetime = LifeTime.Transient)] - public class ArticleCategoryRepository : BaseRepository - { - - } -} diff --git a/ZR.Repository/System/SysDeptRepository.cs b/ZR.Repository/System/SysDeptRepository.cs index 59b1cce..d9adac0 100644 --- a/ZR.Repository/System/SysDeptRepository.cs +++ b/ZR.Repository/System/SysDeptRepository.cs @@ -4,31 +4,6 @@ using ZR.Model.System; namespace ZR.Repository.System { - /// - /// 部门管理 - /// - [AppService(ServiceLifetime = LifeTime.Transient)] - public class SysDeptRepository : BaseRepository - { - /// - /// - /// - /// - /// - public List SelectChildrenDeptById(long deptId) - { - string sql = "select * from sys_dept where find_in_set(@deptId, ancestors)"; - - return Context.SqlQueryable(sql).AddParameters(new { @deptId = deptId }).ToList(); - } - - public int UdateDeptChildren(List dept) - { - return Context.Updateable(dept).WhereColumns(f => new { f.DeptId }) - .UpdateColumns(it => new { it.Ancestors }).ExecuteCommand(); - } - } - /// /// 角色部门 /// diff --git a/ZR.Repository/System/SysFileRepository.cs b/ZR.Repository/System/SysFileRepository.cs deleted file mode 100644 index 867dd5f..0000000 --- a/ZR.Repository/System/SysFileRepository.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using Infrastructure.Attribute; -using ZR.Repository.System; -using ZR.Model.Models; -using ZR.Model.System; - -namespace ZR.Repository.System -{ - /// - /// 文件存储仓储 - /// - /// @author zz - /// @date 2021-12-15 - /// - [AppService(ServiceLifetime = LifeTime.Transient)] - public class SysFileRepository : BaseRepository - { - #region 业务逻辑代码 - #endregion - } -} \ No newline at end of file diff --git a/ZR.Repository/System/SysUserRepository.cs b/ZR.Repository/System/SysUserRepository.cs index 6b9fa61..f7b8917 100644 --- a/ZR.Repository/System/SysUserRepository.cs +++ b/ZR.Repository/System/SysUserRepository.cs @@ -2,11 +2,11 @@ using Infrastructure.Extensions; using SqlSugar; using System; -using System.Collections; using System.Collections.Generic; using System.Linq; using ZR.Model; using ZR.Model.System; +using ZR.Model.System.Dto; namespace ZR.Repository.System { @@ -161,5 +161,29 @@ namespace ZR.Repository.System }) .Where(f => f.UserId == user.UserId).ExecuteCommand(); } + + /// + /// 登录 + /// + /// 登录实体 + /// + public SysUser Login(LoginBodyDto user) + { + return GetFirst(it => it.UserName == user.Username && it.Password == user.Password); + } + + /// + /// 修改登录信息 + /// + /// + /// + /// + public void UpdateLoginInfo(LoginBodyDto user, long userId) + { + var db = Context; + db.Updateable(new SysUser() { LoginIP = user.LoginIP, LoginDate = db.GetDate(), UserId = userId }) + .UpdateColumns(it => new { it.LoginIP, it.LoginDate }) + .ExecuteCommand(); + } } } diff --git a/ZR.Repository/System/SysUserRoleRepository.cs b/ZR.Repository/System/SysUserRoleRepository.cs index ec71d72..21f0b1e 100644 --- a/ZR.Repository/System/SysUserRoleRepository.cs +++ b/ZR.Repository/System/SysUserRoleRepository.cs @@ -11,16 +11,6 @@ namespace ZR.Repository.System [AppService(ServiceLifetime = LifeTime.Transient)] public class SysUserRoleRepository : BaseRepository { - /// - /// 删除用户角色 - /// - /// - /// - public int DeleteUserRoleByUserId(int userId) - { - return Context.Deleteable().Where(it => it.UserId == userId).ExecuteCommand(); - } - /// /// 批量删除角色对应用户 /// @@ -33,36 +23,6 @@ namespace ZR.Repository.System .ExecuteCommand(); } - /// - /// 添加用户角色 - /// - /// - /// - public int AddUserRole(List sysUsers) - { - return Context.Insertable(sysUsers).ExecuteCommand(); - } - - /// - /// 删除角色关联的用户 - /// - /// - /// - public int DeleteUserRoleByRoleId(int roleId) - { - return Context.Deleteable().In(roleId).ExecuteCommand(); - } - - /// - /// 获取角色分配个数 - /// - /// - /// - public int CountUserRoleByRoleId(long roleId) - { - return Context.Queryable().Where(it => it.RoleId == roleId).Count(); - } - /// /// 获取用户数据根据角色id /// diff --git a/ZR.Repository/ZR.Repository.csproj b/ZR.Repository/ZR.Repository.csproj index 2e31021..03ec7d5 100644 --- a/ZR.Repository/ZR.Repository.csproj +++ b/ZR.Repository/ZR.Repository.csproj @@ -4,10 +4,25 @@ net6.0 - - - - + + + + + + + + + + + + + + + + + + + diff --git a/ZR.Service/System/ArticleCategoryService.cs b/ZR.Service/System/ArticleCategoryService.cs index 3070624..9f33e26 100644 --- a/ZR.Service/System/ArticleCategoryService.cs +++ b/ZR.Service/System/ArticleCategoryService.cs @@ -1,13 +1,10 @@ using Infrastructure.Attribute; using SqlSugar; -using SqlSugar.IOC; using System.Collections.Generic; -using System.Linq; using ZR.Model; using ZR.Model.Dto; using ZR.Model.System; using ZR.Repository; -using ZR.Repository.System; using ZR.Service.System.IService; namespace ZR.Service.System @@ -18,12 +15,6 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(IArticleCategoryService), ServiceLifetime = LifeTime.Transient)] public class ArticleCategoryService : BaseService, IArticleCategoryService { - private readonly ArticleCategoryRepository _ArticleCategoryRepository; - public ArticleCategoryService(ArticleCategoryRepository repository) - { - _ArticleCategoryRepository = repository; - } - /// /// 查询文章目录列表 /// @@ -35,8 +26,7 @@ namespace ZR.Service.System var predicate = Expressionable.Create(); //搜索条件查询语法参考Sqlsugar - var response = _ArticleCategoryRepository - .Queryable() + var response = Queryable() .Where(predicate.ToExpression()) .ToPage(parm); @@ -55,7 +45,7 @@ namespace ZR.Service.System //搜索条件查询语法参考Sqlsugar - var response = _ArticleCategoryRepository.Queryable().Where(predicate.ToExpression()) + var response = Queryable().Where(predicate.ToExpression()) .ToTree(it => it.Children, it => it.ParentId, 0); return response; @@ -68,7 +58,7 @@ namespace ZR.Service.System /// public int AddArticleCategory(ArticleCategory parm) { - var response = _ArticleCategoryRepository.Insert(parm, it => new + var response = Insert(parm, it => new { it.Name, it.CreateTime, diff --git a/ZR.Service/System/CommonLangService.cs b/ZR.Service/System/CommonLangService.cs index 4abe031..7e56122 100644 --- a/ZR.Service/System/CommonLangService.cs +++ b/ZR.Service/System/CommonLangService.cs @@ -20,12 +20,6 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(ICommonLangService), ServiceLifetime = LifeTime.Transient)] public class CommonLangService : BaseService, ICommonLangService { - private readonly CommonLangRepository _CommonLangrepository; - public CommonLangService(CommonLangRepository repository) - { - _CommonLangrepository = repository; - } - #region 业务逻辑代码 /// @@ -42,8 +36,7 @@ namespace ZR.Service.System predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangCode), it => it.LangCode == parm.LangCode); predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangKey), it => it.LangKey.Contains(parm.LangKey)); predicate = predicate.AndIF(parm.BeginAddtime != null, it => it.Addtime >= parm.BeginAddtime && it.Addtime <= parm.EndAddtime); - var response = _CommonLangrepository - .Queryable() + var response = Queryable() .Where(predicate.ToExpression()) .ToPage(parm); return response; @@ -63,8 +56,7 @@ namespace ZR.Service.System predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangCode), it => it.LangCode == parm.LangCode); predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangKey), it => it.LangKey.Contains(parm.LangKey)); predicate = predicate.AndIF(parm.BeginAddtime != null, it => it.Addtime >= parm.BeginAddtime && it.Addtime <= parm.EndAddtime); - var response = _CommonLangrepository - .Queryable() + var response = Queryable() .Where(predicate.ToExpression()) .ToPivotList(it => it.LangCode, it => it.LangKey, it => it.Max(f => f.LangName)); return response; @@ -78,8 +70,7 @@ namespace ZR.Service.System //搜索条件查询语法参考Sqlsugar predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangCode), it => it.LangCode == parm.LangCode); //predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangKey), it => it.LangKey.Contains(parm.LangKey)); - var response = _CommonLangrepository - .Queryable() + var response = Queryable() .Where(predicate.ToExpression()) .ToList(); return response; @@ -98,7 +89,7 @@ namespace ZR.Service.System LangName = item.LangName, }); } - var storage = _CommonLangrepository.Storageable(langs) + var storage = Storageable(langs) .WhereColumns(it => new { it.LangKey, it.LangCode }) .ToStorage(); diff --git a/ZR.Service/System/GenTableService.cs b/ZR.Service/System/GenTableService.cs index 6d90d27..99780ef 100644 --- a/ZR.Service/System/GenTableService.cs +++ b/ZR.Service/System/GenTableService.cs @@ -1,14 +1,11 @@ using Infrastructure.Attribute; using Infrastructure.Extensions; -using Newtonsoft.Json; using SqlSugar; using System; using System.Collections.Generic; using System.Linq; -using ZR.Common; using ZR.Model; using ZR.Model.System.Generate; -using ZR.Repository.System; using ZR.Service.System.IService; namespace ZR.Service.System @@ -19,12 +16,10 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(IGenTableService), ServiceLifetime = LifeTime.Transient)] public class GenTableService : BaseService, IGenTableService { - private GenTableRepository GenTableRepository; private IGenTableColumnService GenTableColumnService; - public GenTableService(IGenTableColumnService genTableColumnService, GenTableRepository genTableRepository) + public GenTableService(IGenTableColumnService genTableColumnService) { GenTableColumnService = genTableColumnService; - GenTableRepository = genTableRepository; } /// @@ -34,7 +29,7 @@ namespace ZR.Service.System /// public int DeleteGenTableByIds(long[] tableIds) { - GenTableRepository.Delete(f => tableIds.Contains(f.TableId)); + Delete(f => tableIds.Contains(f.TableId)); return GenTableColumnService.DeleteGenTableColumn(tableIds); } @@ -45,7 +40,7 @@ namespace ZR.Service.System /// public int DeleteGenTableByTbName(string tableName) { - return GenTableRepository.Delete(f => f.TableName == tableName) ? 1 : 0; + return Delete(f => f.TableName == tableName) ? 1 : 0; } /// @@ -55,10 +50,10 @@ namespace ZR.Service.System /// public GenTable GetGenTableInfo(long tableId) { - var info = GenTableRepository.GetId(tableId); + var info = GetId(tableId); if (info != null && !info.SubTableName.IsEmpty()) { - info.SubTable = GenTableRepository.Queryable().Where(f => f.TableName == info.SubTableName).First(); + info.SubTable = Queryable().Where(f => f.TableName == info.SubTableName).First(); } return info; } @@ -69,7 +64,7 @@ namespace ZR.Service.System /// public List GetGenTableAll() { - return GenTableRepository.GetAll(); + return GetAll(); } /// @@ -83,7 +78,7 @@ namespace ZR.Service.System var predicate = Expressionable.Create(); predicate = predicate.AndIF(genTable.TableName.IfNotEmpty(), it => it.TableName.Contains(genTable.TableName)); - return GenTableRepository.GetPages(predicate.ToExpression(), pagerInfo, x => x.TableId, OrderByType.Desc); + return GetPages(predicate.ToExpression(), pagerInfo, x => x.TableId, OrderByType.Desc); } /// @@ -98,7 +93,7 @@ namespace ZR.Service.System //DeleteGenTableByIds(new long[] { table.TableId }); DeleteGenTableByTbName(table.TableName); - return GenTableRepository.Context.Insertable(table).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnIdentity(); + return Insertable(table).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnIdentity(); } /// @@ -113,7 +108,7 @@ namespace ZR.Service.System public int UpdateGenTable(GenTable genTable) { - var db = GenTableRepository.Context; + var db = Context; genTable.Update_time = db.GetDate(); return db.Updateable(genTable).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand(); } @@ -154,12 +149,6 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(IGenTableColumnService), ServiceLifetime = LifeTime.Transient)] public class GenTableColumnService : BaseService, IGenTableColumnService { - - private GenTableColumnRepository GetTableColumnRepository; - public GenTableColumnService(GenTableColumnRepository genTableColumnRepository) - { - GetTableColumnRepository = genTableColumnRepository; - } /// /// 删除表字段 /// @@ -167,8 +156,9 @@ namespace ZR.Service.System /// public int DeleteGenTableColumn(long tableId) { - return GetTableColumnRepository.DeleteGenTableColumn(new long[] { tableId }); + return Deleteable().Where(f => new long[] { tableId }.Contains(f.TableId)).ExecuteCommand(); } + /// /// 根据表id批量删除表字段 /// @@ -176,7 +166,7 @@ namespace ZR.Service.System /// public int DeleteGenTableColumn(long[] tableId) { - return GetTableColumnRepository.DeleteGenTableColumn(tableId); + return Deleteable().Where(f => tableId.Contains(f.TableId)).ExecuteCommand(); } /// @@ -186,7 +176,7 @@ namespace ZR.Service.System /// public int DeleteGenTableColumnByTableName(string tableName) { - return GetTableColumnRepository.DeleteGenTableColumnByTableName(tableName); + return Deleteable().Where(f => f.TableName == tableName).ExecuteCommand(); } /// @@ -196,7 +186,7 @@ namespace ZR.Service.System /// public List GenTableColumns(long tableId) { - return GetTableColumnRepository.GenTableColumns(tableId); + return Queryable().Where(f => f.TableId == tableId).OrderBy(x => x.Sort).ToList(); } /// @@ -206,7 +196,7 @@ namespace ZR.Service.System /// public int InsertGenTableColumn(List tableColumn) { - return GetTableColumnRepository.InsertGenTableColumn(tableColumn); + return Context.Insertable(tableColumn).IgnoreColumns(x => new { x.Remark }).ExecuteCommand(); } /// @@ -216,7 +206,28 @@ namespace ZR.Service.System /// public int UpdateGenTableColumn(List tableColumn) { - return GetTableColumnRepository.UpdateGenTableColumn(tableColumn); + return Context.Updateable(tableColumn) + .WhereColumns(it => new { it.ColumnId, it.TableId }) + .UpdateColumns(it => new + { + it.ColumnComment, + it.CsharpField, + it.CsharpType, + it.IsQuery, + it.IsEdit, + it.IsInsert, + it.IsList, + it.QueryType, + it.HtmlType, + it.IsRequired, + it.Sort, + it.Update_time, + it.DictType, + it.Update_by, + it.Remark, + it.IsSort + }) + .ExecuteCommand(); } } } diff --git a/ZR.Service/System/IService/ISysDeptService.cs b/ZR.Service/System/IService/ISysDeptService.cs index 050429c..ff1bf91 100644 --- a/ZR.Service/System/IService/ISysDeptService.cs +++ b/ZR.Service/System/IService/ISysDeptService.cs @@ -1,8 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; using ZR.Model.System; using ZR.Model.System.Vo; +using ZR.Repository; namespace ZR.Service.System.IService { @@ -22,4 +21,9 @@ namespace ZR.Service.System.IService bool DeleteRoleDeptByRoleId(long roleId); int InsertRoleDepts(SysRole role); } + + public interface ISysRoleDeptService : IBaseService + { + List SelectRoleDeptByRoleId(long roleId); + } } diff --git a/ZR.Service/System/IService/ISysDictDataService.cs b/ZR.Service/System/IService/ISysDictDataService.cs index 96c81f3..b0db87d 100644 --- a/ZR.Service/System/IService/ISysDictDataService.cs +++ b/ZR.Service/System/IService/ISysDictDataService.cs @@ -1,13 +1,10 @@ -using Infrastructure.Model; -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; using ZR.Model; using ZR.Model.System; namespace ZR.Service.System.IService { - public interface ISysDictDataService + public interface ISysDictDataService : IBaseService { public PagedInfo SelectDictDataList(SysDictData dictData, PagerInfo pagerInfo); public List SelectDictDataByType(string dictType); @@ -16,5 +13,7 @@ namespace ZR.Service.System.IService public long InsertDictData(SysDictData dict); public long UpdateDictData(SysDictData dict); public int DeleteDictDataByIds(long[] dictCodes); + int UpdateDictDataType(string old_dictType, string new_dictType); + List SelectDictDataByCustomSql(SysDictType sysDictType); } } diff --git a/ZR.Service/System/IService/ISysUserRoleService.cs b/ZR.Service/System/IService/ISysUserRoleService.cs index eb2bb49..e9de810 100644 --- a/ZR.Service/System/IService/ISysUserRoleService.cs +++ b/ZR.Service/System/IService/ISysUserRoleService.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using ZR.Model; -using ZR.Model.System.Dto; using ZR.Model.System; +using ZR.Model.System.Dto; namespace ZR.Service.System.IService { - public interface ISysUserRoleService + public interface ISysUserRoleService : IBaseService { public int CountUserRoleByRoleId(long roleId); @@ -31,7 +27,7 @@ namespace ZR.Service.System.IService /// /// 添加用户角色 /// - /// + /// /// public int AddUserRole(List sysUsers); diff --git a/ZR.Service/System/SysConfigService.cs b/ZR.Service/System/SysConfigService.cs index 7e651bc..bf59c29 100644 --- a/ZR.Service/System/SysConfigService.cs +++ b/ZR.Service/System/SysConfigService.cs @@ -1,6 +1,5 @@ using Infrastructure.Attribute; using ZR.Model.System; -using ZR.Repository; namespace ZR.Service.System { @@ -10,17 +9,11 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(ISysConfigService), ServiceLifetime = LifeTime.Transient)] public class SysConfigService : BaseService, ISysConfigService { - private readonly SysConfigRepository _SysConfigrepository; - public SysConfigService(SysConfigRepository repository) - { - _SysConfigrepository = repository; - } - #region 业务逻辑代码 public SysConfig GetSysConfigByKey(string key) { - return _SysConfigrepository.Queryable().First(f => f.ConfigKey == key); + return Queryable().First(f => f.ConfigKey == key); } #endregion diff --git a/ZR.Service/System/SysDeptService.cs b/ZR.Service/System/SysDeptService.cs index 4ea6fb0..d45d84d 100644 --- a/ZR.Service/System/SysDeptService.cs +++ b/ZR.Service/System/SysDeptService.cs @@ -20,11 +20,9 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(ISysDeptService), ServiceLifetime = LifeTime.Transient)] public class SysDeptService : BaseService, ISysDeptService { - public SysDeptRepository DeptRepository; - public SysRoleDeptRepository RoleDeptRepository; - public SysDeptService(SysDeptRepository deptRepository, SysRoleDeptRepository roleDeptRepository) + public ISysRoleDeptService RoleDeptRepository; + public SysDeptService(ISysRoleDeptService roleDeptRepository) { - DeptRepository = deptRepository; RoleDeptRepository = roleDeptRepository; } @@ -41,7 +39,7 @@ namespace ZR.Service.System predicate = predicate.AndIF(dept.DeptName.IfNotEmpty(), it => it.DeptName.Contains(dept.DeptName)); predicate = predicate.AndIF(dept.Status.IfNotEmpty(), it => it.Status == dept.Status); - var response = DeptRepository.GetList(predicate.ToExpression()); + var response = GetList(predicate.ToExpression()); return response; } @@ -54,7 +52,7 @@ namespace ZR.Service.System public string CheckDeptNameUnique(SysDept dept) { long deptId = dept.DeptId == 0 ? -1L : dept.DeptId; - SysDept info = DeptRepository.GetFirst(it => it.DeptName == dept.DeptName && it.ParentId == dept.ParentId); + SysDept info = GetFirst(it => it.DeptName == dept.DeptName && it.ParentId == dept.ParentId); if (info != null && info.DeptId != deptId) { return UserConstants.NOT_UNIQUE; @@ -69,7 +67,7 @@ namespace ZR.Service.System /// public int InsertDept(SysDept dept) { - SysDept info = DeptRepository.GetFirst(it => it.DeptId == dept.ParentId); + SysDept info = GetFirst(it => it.DeptId == dept.ParentId); //如果父节点不为正常状态,则不允许新增子节点 if (info != null && !UserConstants.DEPT_NORMAL.Equals(info?.Status)) { @@ -80,7 +78,7 @@ namespace ZR.Service.System { dept.Ancestors = info.Ancestors + "," + dept.ParentId; } - return DeptRepository.Add(dept); + return Add(dept); } /// @@ -90,8 +88,8 @@ namespace ZR.Service.System /// public int UpdateDept(SysDept dept) { - SysDept newParentDept = DeptRepository.GetFirst(it => it.DeptId == dept.ParentId); - SysDept oldDept = DeptRepository.GetFirst(m => m.DeptId == dept.DeptId); + SysDept newParentDept = GetFirst(it => it.DeptId == dept.ParentId); + SysDept oldDept = GetFirst(m => m.DeptId == dept.DeptId); if (newParentDept != null && oldDept != null) { string newAncestors = newParentDept.Ancestors + "," + newParentDept.DeptId; @@ -99,7 +97,7 @@ namespace ZR.Service.System dept.Ancestors = newAncestors; UpdateDeptChildren(dept.DeptId, newAncestors, oldAncestors); } - int result = DeptRepository.Context.Updateable(dept).ExecuteCommand(); + int result = Context.Updateable(dept).ExecuteCommand(); if (UserConstants.DEPT_NORMAL.Equals(dept.Status) && dept.Ancestors.IfNotEmpty() && !"0".Equals(dept.Ancestors)) { @@ -119,7 +117,7 @@ namespace ZR.Service.System dept.Status = "0"; dept.Update_time = DateTime.Now; - DeptRepository.Update(dept, it => new { it.Update_by, it.Update_time, it.Status }, f => depts.Contains(f.DeptId)); + Update(dept, it => new { it.Update_by, it.Update_time, it.Status }, f => depts.Contains(f.DeptId)); } /// @@ -140,7 +138,8 @@ namespace ZR.Service.System } if (children.Any()) { - DeptRepository.UdateDeptChildren(children); + Context.Updateable(children).WhereColumns(f => new { f.DeptId }) + .UpdateColumns(it => new { it.Ancestors }).ExecuteCommand(); } } @@ -285,4 +284,16 @@ namespace ZR.Service.System } #endregion } + + /// + /// 角色部门 + /// + [AppService(ServiceType = typeof(ISysRoleDeptService), ServiceLifetime = LifeTime.Transient)] + public class SysRoleDeptService : BaseService, ISysRoleDeptService + { + public List SelectRoleDeptByRoleId(long roleId) + { + return GetList(it => it.RoleId == roleId).ToList(); + } + } } diff --git a/ZR.Service/System/SysDictDataService.cs b/ZR.Service/System/SysDictDataService.cs index 2b44798..06e003f 100644 --- a/ZR.Service/System/SysDictDataService.cs +++ b/ZR.Service/System/SysDictDataService.cs @@ -1,12 +1,11 @@ using Infrastructure.Attribute; -using Infrastructure.Model; +using SqlSugar; using System; using System.Collections.Generic; -using System.Text; +using System.Linq; using ZR.Common; using ZR.Model; using ZR.Model.System; -using ZR.Repository.System; using ZR.Service.System.IService; namespace ZR.Service.System @@ -17,21 +16,20 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(ISysDictDataService), ServiceLifetime = LifeTime.Transient)] public class SysDictDataService : BaseService, ISysDictDataService { - - private readonly SysDictDataRepository SysDictDataRepository; - public SysDictDataService(SysDictDataRepository sysDictDataRepository) - { - SysDictDataRepository = sysDictDataRepository; - } - /// /// 查询字典数据 /// /// + /// /// public PagedInfo SelectDictDataList(SysDictData dictData, PagerInfo pagerInfo) { - return SysDictDataRepository.SelectDictDataList(dictData, pagerInfo); + //return SysDictDataRepository.SelectDictDataList(dictData, pagerInfo); + var exp = Expressionable.Create(); + exp.AndIF(!string.IsNullOrEmpty(dictData.DictLabel), it => it.DictLabel.Contains(dictData.DictLabel)); + exp.AndIF(!string.IsNullOrEmpty(dictData.Status), it => it.Status == dictData.Status); + exp.AndIF(!string.IsNullOrEmpty(dictData.DictType), it => it.DictType == dictData.DictType); + return GetPages(exp.ToExpression(), pagerInfo); } /// @@ -44,7 +42,9 @@ namespace ZR.Service.System string CK = $"SelectDictDataByType_{dictType}"; if (CacheHelper.GetCache(CK) is not List list) { - list = SysDictDataRepository.SelectDictDataByType(dictType); + list = Queryable().Where(f => f.Status == "0" && f.DictType == dictType) + .OrderBy(it => it.DictSort) + .ToList(); CacheHelper.SetCache(CK, list, 30); } return list; @@ -54,7 +54,9 @@ namespace ZR.Service.System string CK = $"SelectDictDataByTypes_{dictTypes}"; if (CacheHelper.GetCache(CK) is not List list) { - list = SysDictDataRepository.SelectDictDataByTypes(dictTypes); + list = Queryable().Where(f => f.Status == "0" && dictTypes.Contains(f.DictType)) + .OrderBy(it => it.DictSort) + .ToList(); //CacheHelper.SetCache(CK, list, 30); } return list; @@ -69,7 +71,7 @@ namespace ZR.Service.System string CK = $"SelectDictDataByCode_{dictCode}"; if (CacheHelper.GetCache(CK) is not SysDictData list) { - list = SysDictDataRepository.GetFirst(f => f.DictCode == dictCode); + list = GetFirst(f => f.DictCode == dictCode); CacheHelper.SetCache(CK, list, 5); } return list; @@ -82,7 +84,7 @@ namespace ZR.Service.System /// public long InsertDictData(SysDictData dict) { - return SysDictDataRepository.InsertDictData(dict); + return Insertable(dict).ExecuteReturnBigIdentity(); } /// @@ -92,7 +94,19 @@ namespace ZR.Service.System /// public long UpdateDictData(SysDictData dict) { - var result = SysDictDataRepository.UpdateDictData(dict); + var result = Updateable(dict) + .SetColumns(t => new SysDictData() + { + Remark = dict.Remark, + Update_time = DateTime.Now, + DictSort = dict.DictSort, + DictLabel = dict.DictLabel, + DictValue = dict.DictValue, + Status = dict.Status, + CssClass = dict.CssClass, + ListClass = dict.ListClass + }) + .Where(f => f.DictCode == dict.DictCode).ExecuteCommand(); CacheHelper.Remove($"SelectDictDataByCode_{dict.DictCode}"); return result; } @@ -104,7 +118,32 @@ namespace ZR.Service.System /// public int DeleteDictDataByIds(long[] dictCodes) { - return SysDictDataRepository.DeleteDictDataByIds(dictCodes); + return Delete(dictCodes); + } + + /// + /// 同步修改字典类型 + /// + /// 旧字典类型 + /// 新字典类型 + /// + public int UpdateDictDataType(string old_dictType, string new_dictType) + { + //只更新DictType字段根据where条件 + return Context.Updateable() + .SetColumns(t => new SysDictData() { DictType = new_dictType }) + .Where(f => f.DictType == old_dictType) + .ExecuteCommand(); + } + + /// + /// 根据字典类型查询自定义sql + /// + /// + /// + public List SelectDictDataByCustomSql(SysDictType sysDictType) + { + return Context.Ado.SqlQuery(sysDictType?.CustomSql).ToList(); } } } diff --git a/ZR.Service/System/SysDictService.cs b/ZR.Service/System/SysDictService.cs index 8a668f9..f3ae943 100644 --- a/ZR.Service/System/SysDictService.cs +++ b/ZR.Service/System/SysDictService.cs @@ -1,11 +1,10 @@ using Infrastructure; using Infrastructure.Attribute; +using SqlSugar; using System; using System.Collections.Generic; -using System.Text; using ZR.Model; using ZR.Model.System; -using ZR.Repository.System; using ZR.Service.System.IService; namespace ZR.Service.System @@ -16,27 +15,32 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(ISysDictService), ServiceLifetime = LifeTime.Transient)] public class SysDictService : BaseService, ISysDictService { - private SysDictRepository DictRepository; - private SysDictDataRepository DictDataRepository; + private ISysDictDataService DictDataService; - public SysDictService(SysDictRepository sysDictRepository, SysDictDataRepository dictDataRepository) + public SysDictService(ISysDictDataService dictDataRepository) { - this.DictRepository = sysDictRepository; - this.DictDataRepository = dictDataRepository; + this.DictDataService = dictDataRepository; } public List GetAll() { - return DictRepository.GetAll(); + return Queryable().ToList(); } /// /// 查询字段类型列表 /// /// 实体模型 + /// /// - public PagedInfo SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager) + public PagedInfo SelectDictTypeList(SysDictType dictType, PagerInfo pager) { - return DictRepository.SelectDictTypeList(dictType, pager); + var exp = Expressionable.Create(); + exp.AndIF(!string.IsNullOrEmpty(dictType.DictName), it => it.DictName.Contains(dictType.DictName)); + exp.AndIF(!string.IsNullOrEmpty(dictType.Status), it => it.Status == dictType.Status); + exp.AndIF(!string.IsNullOrEmpty(dictType.DictType), it => it.DictType.Contains(dictType.DictType)); + exp.AndIF(!string.IsNullOrEmpty(dictType.Type), it => it.Type.Equals(dictType.Type)); + + return GetPages(exp.ToExpression(), pager, f => f.DictId, OrderByType.Desc); } /// @@ -46,7 +50,7 @@ namespace ZR.Service.System /// public string CheckDictTypeUnique(SysDictType dictType) { - SysDictType sysDictType = DictRepository.GetFirst(f => f.DictType == dictType.DictType); + SysDictType sysDictType = GetFirst(f => f.DictType == dictType.DictType); if (sysDictType != null && sysDictType.DictId != dictType.DictId) { return UserConstants.NOT_UNIQUE; @@ -57,19 +61,19 @@ namespace ZR.Service.System /// /// 批量删除字典数据信息 /// - /// + /// /// public int DeleteDictTypeByIds(long[] dictIds) { foreach (var dictId in dictIds) { - SysDictType dictType = DictRepository.GetFirst(x => x.DictId == dictId); - if (DictDataRepository.Count(f => f.DictType == dictType.DictType) > 0) + SysDictType dictType = GetFirst(x => x.DictId == dictId); + if (DictDataService.Count(f => f.DictType == dictType.DictType) > 0) { throw new CustomException($"{dictType.DictName}已分配,不能删除"); } } - int count = DictRepository.DeleteDictTypeByIds(dictIds); + int count = Context.Deleteable().In(dictIds).ExecuteCommand(); //if (count > 0) //{ // DictUtils.clearDictCache(); @@ -84,7 +88,7 @@ namespace ZR.Service.System /// public long InsertDictType(SysDictType sysDictType) { - return DictRepository.InsertReturnBigIdentity(sysDictType); + return InsertReturnBigIdentity(sysDictType); } /// @@ -94,13 +98,13 @@ namespace ZR.Service.System /// public int UpdateDictType(SysDictType sysDictType) { - SysDictType oldDict = DictRepository.GetFirst(x => x.DictId == sysDictType.DictId); + SysDictType oldDict = GetFirst(x => x.DictId == sysDictType.DictId); if (sysDictType.DictType != oldDict.DictType) { //同步修改 dict_data表里面的DictType值 - DictDataRepository.UpdateDictDataType(oldDict.DictType, sysDictType.DictType); + DictDataService.UpdateDictDataType(oldDict.DictType, sysDictType.DictType); } - return DictRepository.UpdateDictType(sysDictType); + return Context.Updateable(sysDictType).IgnoreColumns(it => new { sysDictType.Create_by }).ExecuteCommand(); } /// @@ -110,7 +114,7 @@ namespace ZR.Service.System /// public SysDictType GetInfo(long dictId) { - return DictRepository.GetFirst(f => f.DictId == dictId); + return GetFirst(f => f.DictId == dictId); } /// @@ -120,13 +124,13 @@ namespace ZR.Service.System /// public List SelectDictDataByCustomSql(string dictType) { - var dictInfo = DictRepository.Queryable() + var dictInfo = Queryable() .Where(f => f.DictType == dictType).First(); if (dictInfo == null || !dictInfo.CustomSql.StartsWith("select", StringComparison.OrdinalIgnoreCase)) { return null; } - return DictDataRepository.SelectDictDataByCustomSql(dictInfo); + return DictDataService.SelectDictDataByCustomSql(dictInfo); } } } diff --git a/ZR.Service/System/SysLoginService.cs b/ZR.Service/System/SysLoginService.cs index 48fa6fa..f4b573a 100644 --- a/ZR.Service/System/SysLoginService.cs +++ b/ZR.Service/System/SysLoginService.cs @@ -1,11 +1,12 @@ using Infrastructure; using Infrastructure.Attribute; +using Infrastructure.Extensions; +using SqlSugar; using System; -using System.Collections.Generic; -using ZR.Common; using ZR.Model; -using ZR.Model.System.Dto; using ZR.Model.System; +using ZR.Model.System.Dto; +using ZR.Repository; using ZR.Repository.System; using ZR.Service.System.IService; @@ -17,11 +18,11 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(ISysLoginService), ServiceLifetime = LifeTime.Transient)] public class SysLoginService: BaseService, ISysLoginService { - private SysLogininfoRepository SysLogininfoRepository; + private readonly SysUserRepository SysUserRepository; - public SysLoginService(SysLogininfoRepository sysLogininfo) + public SysLoginService(SysUserRepository sysUserRepository) { - SysLogininfoRepository = sysLogininfo; + SysUserRepository = sysUserRepository; } /// @@ -34,7 +35,7 @@ namespace ZR.Service.System //密码md5 loginBody.Password = NETCore.Encrypt.EncryptProvider.Md5(loginBody.Password); - SysUser user = SysLogininfoRepository.Login(loginBody); + SysUser user = SysUserRepository.Login(loginBody); logininfor.UserName = loginBody.Username; logininfor.Status = "1"; logininfor.LoginTime = DateTime.Now; @@ -55,11 +56,10 @@ namespace ZR.Service.System logininfor.Status = "0"; logininfor.Msg = "登录成功"; AddLoginInfo(logininfor); - SysLogininfoRepository.UpdateLoginInfo(loginBody, user.UserId); + SysUserRepository.UpdateLoginInfo(loginBody, user.UserId); return user; } - /// /// 查询操作日志 /// @@ -71,8 +71,15 @@ namespace ZR.Service.System logininfoDto.BeginTime = DateTimeHelper.GetBeginTime(logininfoDto.BeginTime, -1); logininfoDto.EndTime = DateTimeHelper.GetBeginTime(logininfoDto.EndTime, 1); - var list = SysLogininfoRepository.GetLoginLog(logininfoDto, pager); - return list; + var exp = Expressionable.Create(); + exp.And(it => it.LoginTime >= logininfoDto.BeginTime && it.LoginTime <= logininfoDto.EndTime); + exp.AndIF(logininfoDto.Ipaddr.IfNotEmpty(), f => f.Ipaddr == logininfoDto.Ipaddr); + exp.AndIF(logininfoDto.UserName.IfNotEmpty(), f => f.UserName.Contains(logininfoDto.UserName)); + exp.AndIF(logininfoDto.Status.IfNotEmpty(), f => f.Status == logininfoDto.Status); + var query = Queryable().Where(exp.ToExpression()) + .OrderBy(it => it.InfoId, OrderByType.Desc); + + return query.ToPage(pager); } /// @@ -82,7 +89,7 @@ namespace ZR.Service.System /// public void AddLoginInfo(SysLogininfor sysLogininfor) { - SysLogininfoRepository.AddLoginInfo(sysLogininfor); + Insert(sysLogininfor); } /// @@ -90,7 +97,7 @@ namespace ZR.Service.System /// public void TruncateLogininfo() { - SysLogininfoRepository.TruncateLogininfo(); + Truncate(); } /// @@ -100,7 +107,7 @@ namespace ZR.Service.System /// public int DeleteLogininforByIds(long[] ids) { - return SysLogininfoRepository.DeleteLogininforByIds(ids); + return Delete(ids); } } } diff --git a/ZR.Service/System/SysNoticeService.cs b/ZR.Service/System/SysNoticeService.cs index dfd5dfa..bbe99e9 100644 --- a/ZR.Service/System/SysNoticeService.cs +++ b/ZR.Service/System/SysNoticeService.cs @@ -1,11 +1,8 @@ -using Infrastructure; using Infrastructure.Attribute; using SqlSugar; using System.Collections.Generic; using ZR.Model.Models; using ZR.Model.System; -using ZR.Repository; -using ZR.Repository.System; using ZR.Service.System.IService; namespace ZR.Service.System @@ -19,12 +16,6 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(ISysNoticeService), ServiceLifetime = LifeTime.Transient)] public class SysNoticeService : BaseService, ISysNoticeService { - private readonly SysNoticeRepository _SysNoticerepository; - public SysNoticeService(SysNoticeRepository repository) - { - _SysNoticerepository = repository; - } - #region 业务逻辑代码 /// @@ -38,7 +29,7 @@ namespace ZR.Service.System //搜索条件查询语法参考Sqlsugar predicate = predicate.And(m => m.Status == "0"); - return _SysNoticerepository.GetList(predicate.ToExpression()); + return GetList(predicate.ToExpression()); } #endregion diff --git a/ZR.Service/System/SysOperLogService.cs b/ZR.Service/System/SysOperLogService.cs index cefb0ff..53cff44 100644 --- a/ZR.Service/System/SysOperLogService.cs +++ b/ZR.Service/System/SysOperLogService.cs @@ -1,9 +1,10 @@ using Infrastructure; using Infrastructure.Attribute; +using Infrastructure.Extensions; +using SqlSugar; using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; -using ZR.Repository.System; using ZR.Service.System.IService; namespace ZR.Service.System @@ -14,13 +15,6 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(ISysOperLogService), ServiceLifetime = LifeTime.Transient)] public class SysOperLogService : BaseService, ISysOperLogService { - public SysOperLogRepository sysOperLogRepository; - - public SysOperLogService(SysOperLogRepository sysOperLog) - { - sysOperLogRepository = sysOperLog; - } - /// /// 新增操作日志操作 /// @@ -31,28 +25,34 @@ namespace ZR.Service.System { operLog.OperParam = operLog.OperParam[..1000]; } - sysOperLogRepository.AddSysOperLog(operLog); + //sysOperLogRepository.AddSysOperLog(operLog); + Insert(operLog); } /// /// 查询系统操作日志集合 /// - /// 操作日志对象 + /// 操作日志对象 /// /// 操作日志集合 - public PagedInfo SelectOperLogList(SysOperLogDto operLog, PagerInfo pager) + public PagedInfo SelectOperLogList(SysOperLogDto sysOper, PagerInfo pager) { - operLog.BeginTime = DateTimeHelper.GetBeginTime(operLog.BeginTime, -1); - operLog.EndTime = DateTimeHelper.GetBeginTime(operLog.EndTime, 1); + sysOper.BeginTime = DateTimeHelper.GetBeginTime(sysOper.BeginTime, -1); + sysOper.EndTime = DateTimeHelper.GetBeginTime(sysOper.EndTime, 1); bool isDemoMode = AppSettings.GetAppConfig("DemoMode", false); if (isDemoMode) { return new PagedInfo(); } - var list = sysOperLogRepository.GetSysOperLog(operLog, pager); + var exp = Expressionable.Create(); + exp.And(it => it.OperTime >= sysOper.BeginTime && it.OperTime <= sysOper.EndTime); + exp.AndIF(sysOper.Title.IfNotEmpty(), it => it.Title.Contains(sysOper.Title)); + exp.AndIF(sysOper.operName.IfNotEmpty(), it => it.OperName.Contains(sysOper.operName)); + exp.AndIF(sysOper.BusinessType != -1, it => it.BusinessType == sysOper.BusinessType); + exp.AndIF(sysOper.Status != -1, it => it.Status == sysOper.Status); - return list; + return GetPages(exp.ToExpression(), pager, x => x.OperId, OrderByType.Desc); } /// @@ -60,7 +60,7 @@ namespace ZR.Service.System /// public void CleanOperLog() { - sysOperLogRepository.ClearOperLog(); + Truncate(); } /// @@ -70,7 +70,7 @@ namespace ZR.Service.System /// 结果 public int DeleteOperLogByIds(long[] operIds) { - return sysOperLogRepository.DeleteOperLogByIds(operIds); + return Context.Deleteable().In(operIds).ExecuteCommand(); } /// @@ -80,7 +80,7 @@ namespace ZR.Service.System /// 操作日志对象 public SysOperLog SelectOperLogById(long operId) { - return sysOperLogRepository.SelectOperLogById(operId); + return GetById(operId); } } } diff --git a/ZR.Service/System/SysPostService.cs b/ZR.Service/System/SysPostService.cs index a0abc0e..245519d 100644 --- a/ZR.Service/System/SysPostService.cs +++ b/ZR.Service/System/SysPostService.cs @@ -1,10 +1,6 @@ using Infrastructure.Attribute; -using System; using System.Collections.Generic; -using System.Text; using ZR.Model.System; -using ZR.Repository; -using ZR.Repository.System; using ZR.Service.System.IService; namespace ZR.Service.System @@ -15,12 +11,6 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(ISysPostService), ServiceLifetime = LifeTime.Transient)] public class SysPostService : BaseService, ISysPostService { - public SysPostRepository PostRepository; - public SysPostService(SysPostRepository postRepository) - { - PostRepository = postRepository; - } - /// /// 校验岗位编码是否唯一 /// @@ -28,7 +18,7 @@ namespace ZR.Service.System /// public string CheckPostCodeUnique(SysPost post) { - SysPost info = PostRepository.GetFirst(it => it.PostCode.Equals(post.PostCode)); + SysPost info = GetFirst(it => it.PostCode.Equals(post.PostCode)); if (info != null && info.PostId != post.PostId) { return UserConstants.NOT_UNIQUE; @@ -43,7 +33,7 @@ namespace ZR.Service.System /// public string CheckPostNameUnique(SysPost post) { - SysPost info = PostRepository.GetFirst(it => it.PostName.Equals(post.PostName)); + SysPost info = GetFirst(it => it.PostName.Equals(post.PostName)); if (info != null && info.PostId != post.PostId) { return UserConstants.NOT_UNIQUE; @@ -53,7 +43,7 @@ namespace ZR.Service.System public List GetAll() { - return PostRepository.GetAll(); + return GetAll(false); } } } diff --git a/ZR.Service/System/SysRoleService.cs b/ZR.Service/System/SysRoleService.cs index 74b705c..17b5456 100644 --- a/ZR.Service/System/SysRoleService.cs +++ b/ZR.Service/System/SysRoleService.cs @@ -47,7 +47,6 @@ namespace ZR.Service /// /// 查询所有角色 /// - /// /// public List SelectRoleAll() { diff --git a/ZR.Service/System/SysUserPostService.cs b/ZR.Service/System/SysUserPostService.cs index f7c9ac8..9785944 100644 --- a/ZR.Service/System/SysUserPostService.cs +++ b/ZR.Service/System/SysUserPostService.cs @@ -1,10 +1,8 @@ using Infrastructure.Attribute; -using System; +using SqlSugar; using System.Collections.Generic; using System.Linq; -using System.Text; using ZR.Model.System; -using ZR.Repository.System; using ZR.Service.System.IService; namespace ZR.Service.System @@ -13,14 +11,8 @@ namespace ZR.Service.System /// 用户岗位 /// [AppService(ServiceType = typeof(ISysUserPostService), ServiceLifetime = LifeTime.Transient)] - public class SysUserPostService : ISysUserPostService + public class SysUserPostService : BaseService, ISysUserPostService { - private SysUserPostRepository UserPostRepository; - public SysUserPostService(SysUserPostRepository userPostRepository) - { - UserPostRepository = userPostRepository; - } - /// /// 新增用户岗位信息 /// @@ -33,7 +25,7 @@ namespace ZR.Service.System { list.Add(new SysUserPost() { PostId = item, UserId = user.UserId }); } - UserPostRepository.Insert(list); + Insert(list); } @@ -44,7 +36,7 @@ namespace ZR.Service.System /// public List GetUserPostsByUserId(long userId) { - var list = UserPostRepository.GetList(f => f.UserId == userId); + var list = GetList(f => f.UserId == userId); return list.Select(x => x.PostId).ToList(); } @@ -55,13 +47,26 @@ namespace ZR.Service.System /// public string GetPostsStrByUserId(long userId) { - var list = UserPostRepository.SelectPostsByUserId(userId); + var list = SelectPostsByUserId(userId); return string.Join(',', list.Select(x => x.PostName)); } public bool Delete(long userId) { - return UserPostRepository.Delete(x => x.UserId == userId); + return Delete(x => x.UserId == userId); + } + + /// + /// 获取用户岗位 + /// + /// + /// + public List SelectPostsByUserId(long userId) + { + return Context.Queryable((p, up) => new JoinQueryInfos( + JoinType.Left, up.PostId == p.PostId + )).Where((p, up) => up.UserId == userId) + .Select().ToList(); } } } diff --git a/ZR.Service/System/SysUserRoleService.cs b/ZR.Service/System/SysUserRoleService.cs index 0b9d993..167a631 100644 --- a/ZR.Service/System/SysUserRoleService.cs +++ b/ZR.Service/System/SysUserRoleService.cs @@ -1,10 +1,8 @@ using Infrastructure.Attribute; -using System; using System.Collections.Generic; -using System.Text; using ZR.Model; -using ZR.Model.System.Dto; using ZR.Model.System; +using ZR.Model.System.Dto; using ZR.Repository.System; using ZR.Service.System.IService; @@ -14,7 +12,7 @@ namespace ZR.Service.System /// 用户角色 /// [AppService(ServiceType = typeof(ISysUserRoleService), ServiceLifetime = LifeTime.Transient)] - public class SysUserRoleService : ISysUserRoleService + public class SysUserRoleService : BaseService, ISysUserRoleService { public SysUserRoleRepository SysUserRoleRepository; @@ -23,7 +21,6 @@ namespace ZR.Service.System SysUserRoleRepository = sysUserRoleRepository; } - /// /// 通过角色ID查询角色使用数量 /// @@ -31,7 +28,7 @@ namespace ZR.Service.System /// public int CountUserRoleByRoleId(long roleId) { - return SysUserRoleRepository.CountUserRoleByRoleId(roleId); + return Count(it => it.RoleId == roleId); } /// @@ -41,7 +38,7 @@ namespace ZR.Service.System /// public int DeleteUserRoleByUserId(int userId) { - return SysUserRoleRepository.DeleteUserRoleByUserId(userId); + return Deleteable().Where(it => it.UserId == userId).ExecuteCommand(); } /// @@ -58,11 +55,11 @@ namespace ZR.Service.System /// /// 添加用户角色 /// - /// + /// /// - public int AddUserRole(List sysUsers) + public int AddUserRole(List sysUserRoles) { - return SysUserRoleRepository.AddUserRole(sysUsers); + return Insert(sysUserRoles); } /// @@ -102,7 +99,7 @@ namespace ZR.Service.System /// public int InsertUserRole(SysUser user) { - List userRoles = new List(); + List userRoles = new(); foreach (var item in user.RoleIds) { userRoles.Add(new SysUserRole() { RoleId = item, UserId = user.UserId }); @@ -114,8 +111,7 @@ namespace ZR.Service.System /// /// 新增加角色用户 /// - /// 角色id - /// 用户ids + /// /// public int InsertRoleUser(RoleUsersCreateDto roleUsersCreateDto) {