优化仓储

ZR.Service/System/IService/ISysMenuService.cs

@@ -5,7 +5,7 @@ using ZR.Model.System.Vo;
 
 namespace ZR.Service.System.IService
 {
-    public interface ISysMenuService
+    public interface ISysMenuService : IBaseService<SysMenu>
     {
         //List<SysMenu> SelectMenuList(long userId);
 
@@ -13,7 +13,7 @@ namespace ZR.Service.System.IService
         List<SysMenu> SelectTreeMenuList(MenuQueryDto menu, long userId);
 
         SysMenu GetMenuByMenuId(int menuId);
-        List<SysMenu> GetMenusByMenuId(int menuId);
+        List<SysMenu> GetMenusByMenuId(int menuId, long userId);
         int AddMenu(SysMenu menu);
 
         int EditMenu(SysMenu menu);
@@ -28,14 +28,49 @@ namespace ZR.Service.System.IService
 
         List<SysMenu> SelectMenuTreeByUserId(long userId);
 
-        List<SysMenu> SelectMenuPermsListByUserId(long userId);
+        //List<SysMenu> SelectMenuPermsListByUserId(long userId);
 
         List<string> SelectMenuPermsByUserId(long userId);
 
-        bool CheckMenuExistRole(long menuId);
+        //bool CheckMenuExistRole(long menuId);
 
         List<RouterVo> BuildMenus(List<SysMenu> menus);
 
         List<TreeSelectVo> BuildMenuTreeSelect(List<SysMenu> menus);
     }
+
+    /// <summary>
+    /// 角色菜单
+    /// </summary>
+    public interface ISysRoleMenuService : IBaseService<SysRoleMenu>
+    {
+        bool CheckMenuExistRole(long menuId);
+        /// <summary>
+        /// 根据角色获取菜单id
+        /// </summary>
+        /// <param name="roleId"></param>
+        /// <returns></returns>
+        List<SysRoleMenu> SelectRoleMenuByRoleId(long roleId);
+
+        /// <summary>
+        /// 根据用户所有角色获取菜单
+        /// </summary>
+        /// <param name="roleIds"></param>
+        /// <returns></returns>
+        List<SysRoleMenu> SelectRoleMenuByRoleIds(long[] roleIds);
+
+        /// <summary>
+        /// 批量插入用户菜单
+        /// </summary>
+        /// <param name="sysRoleMenus"></param>
+        /// <returns></returns>
+        int AddRoleMenu(List<SysRoleMenu> sysRoleMenus);
+
+        /// <summary>
+        /// 删除角色与菜单关联
+        /// </summary>
+        /// <param name="roleId"></param>
+        /// <returns></returns>
+        int DeleteRoleMenuByRoleId(long roleId);
+    }
 }

ZR.Service/System/IService/ISysRoleService.cs

@@ -137,5 +137,7 @@ namespace ZR.Service.System.IService
         /// <param name="sysRole">角色信息</param>
         /// <returns></returns>
         public int UpdateRole(SysRole sysRole);
+
+        int UpdateSysRole(SysRole sysRole);
     }
 }

ZR.Service/System/IService/ISysUserService.cs

@@ -1,4 +1,5 @@
-using ZR.Model;
+using System.Collections.Generic;
+using ZR.Model;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
 
@@ -70,5 +71,16 @@ namespace ZR.Service.System.IService
         SysUser Register(RegisterDto dto);
         void CheckUserAllowed(SysUser user);
         void CheckUserDataScope(long userid, long loginUserId);
+
+        /// <summary>
+        /// 导入
+        /// </summary>
+        /// <param name="users"></param>
+        /// <returns></returns>
+        string ImportUsers(List<SysUser> users);
+
+        SysUser Login(LoginBodyDto user);
+
+        void UpdateLoginInfo(LoginBodyDto user, long userId);
     }
 }