优化项目命名空间

ZR.Service/System/ArticleCategoryService.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/ArticleService.cs

@@ -1,6 +1,6 @@
 using Infrastructure.Attribute;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/IService/IArticleCategoryService.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZR.Model.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface IArticleCategoryService : IBaseService<ArticleCategory>
+    {
+        List<ArticleCategory> BuildCategoryTree(List<ArticleCategory> categories);
+    }
+}

ZR.Service/System/IService/IArticleService.cs

@@ -0,0 +1,15 @@
+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.Service.System.IService
+{
+    public interface IArticleService : IBaseService<Article>
+    {
+
+    }
+}

ZR.Service/System/IService/ISysDeptService.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZR.Model.System;
+using ZR.Model.Vo.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface ISysDeptService : IBaseService<SysDept>
+    {
+        public List<SysDept> 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<SysDept> GetChildrenDepts(List<SysDept> depts, long deptId);
+        public List<SysDept> BuildDeptTree(List<SysDept> depts);
+        public List<TreeSelectVo> BuildDeptTreeSelect(List<SysDept> depts);
+    }
+}

ZR.Service/System/IService/ISysDictDataService.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZR.Model.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface ISysDictDataService : IBaseService<SysDictData>
+    {
+        public List<SysDictData> SelectDictDataList(SysDictData dictData);
+        public List<SysDictData> SelectDictDataByType(string dictType);
+        public SysDictData SelectDictDataById(long dictCode);
+        public long InsertDictData(SysDictData dict);
+        public long UpdateDictData(SysDictData dict);
+        public int DeleteDictDataByIds(long[] dictCodes);
+    }
+}

ZR.Service/System/IService/ISysDictService.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZR.Model.System;
+
+namespace ZR.Service.System.IService
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public interface ISysDictService: IBaseService<SysDictType>
+    {
+        public List<SysDictType> SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager);
+
+        /// <summary>
+        /// 校验字典类型称是否唯一
+        /// </summary>
+        /// <param name="dictType">字典类型</param>
+        /// <returns></returns>
+        public string CheckDictTypeUnique(SysDictType dictType);
+
+        /// <summary>
+        /// 批量删除字典数据信息
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public int DeleteDictTypeByIds(long[] dictIds);
+
+        /// <summary>
+        /// 插入字典类型
+        /// </summary>
+        /// <param name="sysDictType"></param>
+        /// <returns></returns>
+        public long InsertDictType(SysDictType sysDictType);
+
+        /// <summary>
+        /// 修改字典类型
+        /// </summary>
+        /// <param name="sysDictType"></param>
+        /// <returns></returns>
+        public int UpdateDictType(SysDictType sysDictType);
+    }
+}

ZR.Service/System/IService/ISysFileService.cs

@@ -0,0 +1,9 @@
+using Infrastructure.Attribute;
+using ZR.Model.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface ISysFileService : IBaseService<SysFile>
+    {
+    }
+}

ZR.Service/System/IService/ISysLoginService.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZR.Model;
+using ZR.Model.System.Dto;
+using ZR.Model.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface ISysLoginService
+    {
+        public SysUser Login(LoginBodyDto loginBody, SysLogininfor logininfor);
+
+        /// <summary>
+        /// 查询操作日志
+        /// </summary>
+        /// <param name="logininfoDto"></param>
+        /// <param name="pager">分页</param>
+        /// <returns></returns>
+        public List<SysLogininfor> GetLoginLog(SysLogininfor logininfoDto, PagerInfo pager);
+
+        /// <summary>
+        /// 记录登录日志
+        /// </summary>
+        /// <param name="sysLogininfor"></param>
+        /// <returns></returns>
+        public void AddLoginInfo(SysLogininfor sysLogininfor);
+
+        /// <summary>
+        /// 清空登录日志
+        /// </summary>
+        public void TruncateLogininfo();
+
+        /// <summary>
+        /// 删除登录日志
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public int DeleteLogininforByIds(long[] ids);
+    }
+}

ZR.Service/System/IService/ISysMenuService.cs

@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using ZR.Model.System.Dto;
+using ZR.Model.System;
+using ZR.Model.System.Vo;
+using ZR.Model.Vo.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface ISysMenuService: IBaseService<SysMenu>
+    {
+        public List<SysMenu> SelectMenuList(long userId);
+
+        public List<SysMenu> SelectMenuList(SysMenu menu, long userId);
+
+        public SysMenu GetMenuByMenuId(int menuId);
+
+        public int AddMenu(SysMenu menu);
+
+        public int EditMenu(SysMenu menu);
+
+        public int DeleteMenuById(int menuId);
+
+        public string CheckMenuNameUnique(SysMenu menu);
+
+        public int ChangeSortMenu(MenuDto menuDto);
+
+        public bool HasChildByMenuId(long menuId);
+
+        public List<SysMenu> SelectMenuTreeByUserId(long userId);
+
+        public List<SysMenu> SelectMenuPermsListByUserId(long userId);
+
+        public List<string> SelectMenuPermsByUserId(long userId);
+
+        public bool CheckMenuExistRole(long menuId);
+
+        public List<RouterVo> BuildMenus(List<SysMenu> menus);
+
+        public List<TreeSelectVo> BuildMenuTreeSelect(List<SysMenu> menus);
+    }
+}

ZR.Service/System/IService/ISysOperLogService.cs

@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using ZR.Model;
+using ZR.Model.System.Dto;
+using ZR.Model.System;
+using ZR.Service.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface ISysOperLogService : IBaseService<SysOperLog>
+    {
+        public void InsertOperlog(SysOperLog operLog);
+
+        /// <summary>
+        /// 查询系统操作日志集合
+        /// </summary>
+        /// <param name="operLog">操作日志对象</param>
+        /// <param name="pager"></param>
+        /// <returns>操作日志集合</returns>
+        public List<SysOperLog> SelectOperLogList(SysOperLogDto operLog, PagerInfo pager);
+
+        /// <summary>
+        /// 清空操作日志
+        /// </summary>
+        public void CleanOperLog();
+
+        /// <summary>
+        /// 批量删除系统操作日志
+        /// </summary>
+        /// <param name="operIds">需要删除的操作日志ID</param>
+        /// <returns>结果</returns>
+        public int DeleteOperLogByIds(long[] operIds);
+
+        /// <summary>
+        /// 查询操作日志详细
+        /// </summary>
+        /// <param name="operId">操作ID</param>
+        /// <returns>操作日志对象</returns>
+        public SysOperLog SelectOperLogById(long operId);
+    }
+}

ZR.Service/System/IService/ISysPermissionService.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZR.Model.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface ISysPermissionService
+    {
+        public List<string> GetRolePermission(SysUser user);
+        public List<string> GetMenuPermission(SysUser user);
+    }
+}

ZR.Service/System/IService/ISysPostService.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZR.Model.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface ISysPostService: IBaseService<SysPost>
+    {
+        string CheckPostNameUnique(SysPost sysPost);
+        string CheckPostCodeUnique(SysPost sysPost);
+    }
+}

ZR.Service/System/IService/ISysRoleService.cs

@@ -0,0 +1,136 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ZR.Model.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface ISysRoleService: IBaseService<SysRole>
+    {
+        /// <summary>
+        /// 根据条件分页查询角色数据
+        /// </summary>
+        /// <param name="role">角色信息</param>
+        /// <returns>角色数据集合信息</returns>
+        public List<SysRole> SelectRoleList(SysRole role);
+
+        /// <summary>
+        /// 查询所有角色
+        /// </summary>
+        /// <param name="role"></param>
+        /// <returns></returns>
+        public List<SysRole> SelectRoleAll();
+
+        /// <summary>
+        /// 根据用户查询
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public List<SysRole> SelectRolePermissionByUserId(long userId);
+
+        /// <summary>
+        /// 通过角色ID查询角色
+        /// </summary>
+        /// <param name="roleId">角色ID</param>
+        /// <returns>角色对象信息</returns>
+        public SysRole SelectRoleById(long roleId);
+
+        /// <summary>
+        /// 批量删除角色信息
+        /// </summary>
+        /// <param name="roleIds">需要删除的角色ID</param>
+        /// <returns></returns>
+        public int DeleteRoleByRoleId(long[] roleIds);
+
+        /// <summary>
+        /// 更改角色权限状态
+        /// </summary>
+        /// <param name="SysRoleDto"></param>
+        /// <returns></returns>
+        public int UpdateRoleStatus(SysRole roleDto);
+
+        /// <summary>
+        /// 校验角色权限是否唯一
+        /// </summary>
+        /// <param name="sysRole">角色信息</param>
+        /// <returns></returns>
+        public string CheckRoleKeyUnique(SysRole sysRole);
+
+        /// <summary>
+        /// 校验角色是否允许操作
+        /// </summary>
+        /// <param name="role"></param>
+        public void CheckRoleAllowed(SysRole role);
+
+        /// <summary>
+        /// 新增保存角色信息
+        /// </summary>
+        /// <param name="sysRole">角色信息</param>
+        /// <returns></returns>
+        public long InsertRole(SysRole sysRole);
+
+        /// <summary>
+        /// 通过角色ID删除角色和菜单关联
+        /// </summary>
+        /// <param name="roleId">角色ID</param>
+        /// <returns></returns>
+        public int DeleteRoleMenuByRoleId(long roleId);
+
+        #region Service
+
+
+        /// <summary>
+        /// 新增角色菜单信息
+        /// </summary>
+        /// <param name="sysRoleDto"></param>
+        /// <returns></returns>
+        public int InsertRoleMenu(SysRole sysRoleDto);
+
+        /// <summary>
+        /// 判断是否是管理员
+        /// </summary>
+        /// <param name="userid"></param>
+        /// <returns></returns>
+        public bool IsAdmin(long userid);
+
+        /// <summary>
+        /// 获取角色菜单id集合
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public List<long> SelectUserRoleMenus(long roleId);
+
+        /// <summary>
+        /// 获取用户角色列表
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public List<SysRole> SelectUserRoleListByUserId(long userId);
+
+        /// <summary>
+        /// 获取用户权限集合
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public List<long> SelectUserRoles(long userId);
+        
+        /// <summary>
+        /// 获取用户权限字符串集合
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public List<string> SelectUserRoleKeys(long userId);
+
+        public List<string> SelectUserRoleNames(long userId);
+
+        #endregion
+
+        /// <summary>
+        /// 修改保存角色信息
+        /// </summary>
+        /// <param name="sysRole">角色信息</param>
+        /// <returns></returns>
+        public int UpdateRole(SysRole sysRole);
+    }
+}

ZR.Service/System/IService/ISysTasksLogService.cs

@@ -0,0 +1,14 @@
+using ZR.Model.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface ISysTasksLogService : IBaseService<SysTasksLog>
+    {
+        /// <summary>
+        /// 记录任务执行日志
+        /// </summary>
+        /// <returns></returns>
+        //public int AddTaskLog(string jobId);
+        public SysTasksLog AddTaskLog(string jobId, SysTasksLog tasksLog);
+    }
+}

ZR.Service/System/IService/ISysTasksQzService.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZR.Model.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface ISysTasksQzService: IBaseService<SysTasksQz>
+    {
+    }
+}

ZR.Service/System/IService/ISysUserPostService.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using ZR.Model.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface ISysUserPostService: IBaseService<SysUserPost>
+    {
+        public void InsertUserPost(SysUser user);
+
+        public List<long> GetUserPostsByUserId(long userId);
+
+        public string GetPostsStrByUserId(long userId);
+    }
+}

ZR.Service/System/IService/ISysUserRoleService.cs

@@ -0,0 +1,54 @@
+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.Service.System.IService
+{
+    public interface ISysUserRoleService
+    {
+        public int CountUserRoleByRoleId(long roleId);
+
+        /// <summary>
+        /// 删除用户角色
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public int DeleteUserRoleByUserId(int userId);
+
+        /// <summary>
+        /// 批量删除角色对应用户
+        /// </summary>
+        /// <param name="roleId"></param>
+        /// <param name="userIds"></param>
+        /// <returns></returns>
+        public int DeleteRoleUserByUserIds(long roleId, List<long> userIds);
+
+        /// <summary>
+        /// 添加用户角色
+        /// </summary>
+        /// <param name="sysRoleMenus"></param>
+        /// <returns></returns>
+        public int AddUserRole(List<SysUserRole> sysUsers);
+
+        public List<SysUser> GetSysUsersByRoleId(long roleId);
+
+        /// <summary>
+        /// 新增用户角色信息
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public int InsertUserRole(SysUser user);
+
+        /// <summary>
+        /// 新增加角色用户
+        /// </summary>
+        /// <param name="roleId">角色id</param>
+        /// <param name="userids">用户ids</param>
+        /// <returns></returns>
+        public int InsertRoleUser(RoleUsersCreateDto roleUsersCreateDto);
+    }
+}

ZR.Service/System/IService/ISysUserService.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZR.Model;
+using ZR.Model.System;
+
+namespace ZR.Service.System.IService
+{
+    public interface ISysUserService : IBaseService<SysUser>
+    {
+        public List<SysUser> SelectUserList(SysUser user, PagerInfo pager);
+
+        /// <summary>
+        /// 通过用户ID查询用户
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public SysUser SelectUserById(long userId);
+
+        /// <summary>
+        /// 校验用户名称是否唯一
+        /// </summary>
+        /// <param name="userName"></param>
+        /// <returns></returns>
+        public string CheckUserNameUnique(string userName);
+
+        /// <summary>
+        /// 新增保存用户信息
+        /// </summary>
+        /// <param name="sysUser"></param>
+        /// <returns></returns>
+        public long InsertUser(SysUser sysUser);
+
+        /// <summary>
+        /// 修改用户信息
+        /// </summary>
+        /// <param name="sysUser"></param>
+        /// <returns></returns>
+        public int UpdateUser(SysUser user);
+
+        public int ChangeUser(SysUser user);
+
+        /// <summary>
+        /// 重置密码
+        /// </summary>
+        /// <param name="userid"></param>
+        /// <param name="password"></param>
+        /// <returns></returns>
+        public int ResetPwd(long userid, string password);
+
+        public int ChangeUserStatus(SysUser user);
+
+        /// <summary>
+        /// 删除用户
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public int DeleteUser(long userid);
+
+        /// <summary>
+        /// 修改用户头像
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public int UpdatePhoto(SysUser user);
+    }
+}

ZR.Service/System/SysDeptService.cs

@@ -10,7 +10,7 @@ using ZR.Common;
 using ZR.Model.System;
 using ZR.Model.Vo.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysDictDataService.cs

@@ -5,7 +5,7 @@ using System.Text;
 using ZR.Common;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysDictService.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Text;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysFileService.cs

@@ -1,6 +1,6 @@
 using Infrastructure.Attribute;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysLoginService.cs

@@ -7,7 +7,7 @@ using ZR.Model;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysMenuService.cs

@@ -7,7 +7,7 @@ using ZR.Model.System.Vo;
 using ZR.Model.Vo;
 using ZR.Model.Vo.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service
 {

ZR.Service/System/SysOperLogService.cs

@@ -5,7 +5,7 @@ using ZR.Model;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysPermissionService.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysPostService.cs

@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysRoleService.cs

@@ -7,8 +7,7 @@ using System.Linq;
 using System.Text;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
-using ZR.Service.System;
+using ZR.Service.System.IService;
 
 namespace ZR.Service
 {

ZR.Service/System/SysTasksLogService.cs

@@ -1,7 +1,7 @@
 using Infrastructure.Attribute;
 using System;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysTasksQzService.cs

@@ -1,6 +1,6 @@
 using Infrastructure.Attribute;
 using ZR.Model.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysUserPostService.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysUserRoleService.cs

@@ -5,7 +5,7 @@ using System.Text;
 using ZR.Model.System.Dto;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {

ZR.Service/System/SysUserService.cs

@@ -6,7 +6,7 @@ using System.Text;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Repository.System;
-using ZR.Service.IService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service
 {