wangys/schoolNews
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理等

Browse Source
This commit is contained in:
wangys
2025-10-09 16:35:49 +08:00
parent 047bf39842
commit 39d7d0cf93
44 changed files with 3373 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
schoolNewsServ/.bin/mysql/sql/createTablePermission.sql
View File

@@ -103,7 +103,8 @@ INSERT INTO `tb_sys_permission` (id,permission_id, name, code, description, crea
('2','perm_system_dept_manage', '系统部门查看', 'system:dept:manage', '系统部门查看权限', '1', now()),
('3','perm_system_menu_manage', '系统菜单查看', 'system:menu:manage', '系统菜单查看权限', '1', now()),
('4','perm_system_permission_manage', '系统权限查看', 'system:permission:manage', '系统权限查看权限', '1', now()),
('5','perm_system_role_manage', '系统角色查看', 'system:role:manage', '系统角色查看权限', '1', now());
('5','perm_system_role_manage', '系统角色查看', 'system:role:manage', '系统角色查看权限', '1', now()),
('6','perm_system_user_manage', '系统用户查看', 'system:user:manage', '系统用户查看权限', '1', now());
-- 角色-权限关联
DROP TABLE IF EXISTS `tb_sys_role_permission`;
@@ -126,7 +127,8 @@ INSERT INTO `tb_sys_role_permission` (id, role_id, permission_id, creator, creat
('2', 'admin', 'perm_system_dept_manage', '1', now()),
('3', 'admin', 'perm_system_menu_manage', '1', now()),
('4', 'admin', 'perm_system_permission_manage', '1', now()),
('5', 'admin', 'perm_system_role_manage', '1', now());
('5', 'admin', 'perm_system_role_manage', '1', now()),
('6', 'admin', 'perm_system_user_manage', '1', now());
-- 菜单表
DROP TABLE IF EXISTS `tb_sys_menu`;
@@ -153,12 +155,12 @@ CREATE TABLE `tb_sys_menu` (
-- Insert default menus
INSERT INTO `tb_sys_menu` (id,menu_id, name, parent_id, url, component, icon, order_num, type, creator, create_time) VALUES
('1','menu_system_manage', '系统管理', NULL, '/manage/system/manage', 'manage/system/ManageView', 'el-icon-setting', 1, 1, '1', now()),
('1','menu_system_manage', '系统管理', NULL, '', '', 'el-icon-setting', 1, 1, '1', now()),
('2','menu_system_dept', '部门管理', 'menu_system_manage', '/manage/system/dept', 'manage/system/DeptManageView', 'el-icon-office-building', 2, 1, '1', now()),
('3','menu_system_menu', '菜单管理', 'menu_system_manage', '/manage/system/menu', 'manage/system/MenuManageView', 'el-icon-menu', 2, 1, '1', now()),
('4','menu_system_permission', '权限管理', 'menu_system_manage', '/manage/system/permission', 'manage/system/PermissionManageView', 'el-icon-key', 3, 1, '1', now()),
('5','menu_system_role', '角色管理', 'menu_system_manage', '/manage/system/role', 'manage/system/RoleManageView', 'el-icon-user', 4, 1, '1', now());
('5','menu_system_role', '角色管理', 'menu_system_manage', '/manage/system/role', 'manage/system/RoleManageView', 'el-icon-user', 4, 1, '1', now()),
('6','menu_system_user', '用户管理', 'menu_system_manage', '/manage/system/user', 'manage/system/UserManageView', 'el-icon-user', 5, 1, '1', now());
DROP TABLE IF EXISTS `tb_sys_menu_permission`;
CREATE TABLE `tb_sys_menu_permission` (
`id` VARCHAR(50) NOT NULL COMMENT '菜单权限ID',
@@ -179,4 +181,5 @@ INSERT INTO `tb_sys_menu_permission` (id, permission_id, menu_id, creator, creat
('2', 'perm_system_dept_manage', 'menu_system_dept', '1', now()),
('3', 'perm_system_menu_manage', 'menu_system_menu', '1', now()),
('4', 'perm_system_permission_manage', 'menu_system_permission', '1', now()),
('5', 'perm_system_role_manage', 'menu_system_role', '1', now());
('5', 'perm_system_role_manage', 'menu_system_role', '1', now()),
('6', 'perm_system_user_manage', 'menu_system_user', '1', now());

4
schoolNewsServ/.bin/mysql/sql/createTableUser.sql
View File

@@ -20,8 +20,8 @@ CREATE TABLE `tb_sys_user` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
-- 推荐：把默认 admin 密码替换为已哈希的值
INSERT INTO `tb_sys_user` (id, username, password, email) VALUES
('1', 'admin', '$2a$10$/Bo2SXboVUpYfR6EA.y8puYQaMGBcuNYFY/EkQRY3w27IH56EuEcS', '3223905473@qq.com');
INSERT INTO `tb_sys_user` (id, username, password, email, status) VALUES
('1', 'admin', '$2a$10$/Bo2SXboVUpYfR6EA.y8puYQaMGBcuNYFY/EkQRY3w27IH56EuEcS', '3223905473@qq.com', 0);
-- 用户信息表
DROP TABLE IF EXISTS `tb_sys_user_info`;

48
schoolNewsServ/api/api-system/src/main/java/org/xyzh/api/system/dept/DepartmentService.java
View File

@@ -4,6 +4,8 @@ import java.util.List;
import org.xyzh.common.core.domain.ResultDomain;
import org.xyzh.common.dto.dept.TbSysDept;
import org.xyzh.common.dto.dept.TbSysDeptRole;
import org.xyzh.common.dto.role.TbSysRole;
/**
* @description DepartmentService.java文件描述 部门服务接口
@@ -21,6 +23,15 @@ public interface DepartmentService {
* @since 2025-09-28
*/
ResultDomain<TbSysDept> getAllDepartments();
/**
* @description 查询部门列表
* @param filter 过滤条件
* @return ResultDomain<TbSysDept> 部门列表
* @author yslg
* @since 2025-10-06
*/
ResultDomain<TbSysDept> getDeptList(TbSysDept filter);
/**
* @description 根据ID查询部门
@@ -76,4 +87,41 @@ public interface DepartmentService {
* @since 2025-09-28
*/
ResultDomain<Boolean> checkDepartmentNameExists(String deptName, String excludeId);
/**
* @description 查询部门绑定角色
* @param deptId 部门ID
* @return ResultDomain<TbSysRole> 角色信息
* @author yslg
* @since 2025-09-28
*/
ResultDomain<TbSysRole> getDeptByRole(String deptId);
/**
* @description 查询部门绑定角色
* @return ResultDomain<TbSysDeptRole> 角色信息
* @author yslg
* @since 2025-10-06
*/
ResultDomain<TbSysDeptRole> getDeptByRoleList();
/**
* @description 绑定部门角色
* @param deptIDs 部门ID列表
* @param roleIDs 角色ID列表
* @return ResultDomain<TbSysDeptRole> 部门角色信息
* @author yslg
* @since 2025-09-28
*/
ResultDomain<TbSysDeptRole> bindDeptRole(List<String> deptIDs, List<String> roleIDs);
/**
* @description 解绑部门角色
* @param deptIDs 部门ID列表
* @param roleIDs 角色ID列表
* @return ResultDomain<TbSysDeptRole> 部门角色信息
* @author yslg
* @since 2025-09-28
*/
ResultDomain<TbSysDeptRole> unbindDeptRole(List<String> deptIDs, List<String> roleIDs);
}

51
schoolNewsServ/api/api-system/src/main/java/org/xyzh/api/system/role/RoleService.java
View File

@@ -1,7 +1,9 @@
package org.xyzh.api.system.role;
import org.xyzh.common.core.domain.ResultDomain;
import org.xyzh.common.dto.permission.TbSysPermission;
import org.xyzh.common.dto.role.TbSysRole;
import org.xyzh.common.dto.role.TbSysRolePermission;
import org.xyzh.common.vo.DeptRoleVO;
@@ -23,22 +25,13 @@ public interface RoleService {
ResultDomain<TbSysRole> getAllRoles();
/**
* @description 根据角色ID查询角色
* @param roleId 角色ID
* @return ResultDomain<TbSysRole> 角色信息
* @description 根据过滤条件获取角色列表
* @param filter 过滤条件
* @return ResultDomain<TbSysRole> 角色列表
* @author yslg
* @since 2025-09-28
* @since 2025-10-09
*/
ResultDomain<TbSysRole> getRoleById(String roleId);
/**
* @description 根据用户ID查询部门角色列表
* @param userId 用户ID
* @return ResultDomain<DeptRoleVO> 角色列表
* @author yslg
* @since 2025-09-28
*/
ResultDomain<DeptRoleVO> getDeptRolesByUserId(String userId);
ResultDomain<TbSysRole> getRoleList(TbSysRole filter);
/**
* @description 创建角色
@@ -65,7 +58,25 @@ public interface RoleService {
* @author yslg
* @since 2025-09-28
*/
ResultDomain<TbSysRole> deleteRole(String roleId);
ResultDomain<TbSysRole> deleteRole(TbSysRole role);
/**
* @description 根据角色ID查询角色
* @param roleId 角色ID
* @return ResultDomain<TbSysRole> 角色信息
* @author yslg
* @since 2025-09-28
*/
ResultDomain<TbSysRole> getRoleById(String roleId);
/**
* @description 根据用户ID查询部门角色列表
* @param userId 用户ID
* @return ResultDomain<DeptRoleVO> 角色列表
* @author yslg
* @since 2025-09-28
*/
ResultDomain<DeptRoleVO> getDeptRolesByUserId(String userId);
/**
* @description 检查角色名称是否存在
@@ -86,4 +97,14 @@ public interface RoleService {
* @since 2025-09-28
*/
ResultDomain<TbSysRole> changeRoleStatus(String roleId, Integer status);
/**
* @description 获取角色权限
* @param roleId 角色ID
* @return ResultDomain<TbSysRolePermission> 角色权限信息
* @author yslg
* @since 2025-10-09
*/
ResultDomain<TbSysPermission> getRolePermission(String roleId);
}

31
schoolNewsServ/api/api-system/src/main/java/org/xyzh/api/system/user/UserService.java
View File

@@ -5,7 +5,9 @@ import java.util.List;
import org.xyzh.common.core.domain.ResultDomain;
import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.common.dto.user.TbSysUserDeptRole;
import org.xyzh.common.dto.user.TbSysUserInfo;
import org.xyzh.common.vo.UserDeptRoleVO;
/**
* @description UserRemoteService.java文件描述 用户远程服务接口
@@ -148,6 +150,35 @@ public interface UserService {
*/
ResultDomain<TbSysUser> resetPassword(String userId, String newPassword);
/**
* @description 绑定用户部门角色
* @param filter
* @return ResultDomain<UserDeptRoleVO> 绑定结果
* @author yslg
* @since 2025-10-09
*/
ResultDomain<TbSysUserDeptRole> getBindUserDeptRoleList(TbSysUserDeptRole filter);
/**
* @description 绑定用户部门角色
* @param filter
* @return ResultDomain<UserDeptRoleVO> 绑定结果
* @author yslg
* @since 2025-10-09
*/
ResultDomain<UserDeptRoleVO> bindUserDeptRole(UserDeptRoleVO userDeptRoleVO);
/**
* @description 解绑用户部门角色
* @param filter
* @return ResultDomain<UserDeptRoleVO> 解绑结果
* @author yslg
* @since 2025-10-09
*/
ResultDomain<UserDeptRoleVO> unbindUserDeptRole(UserDeptRoleVO userDeptRoleVO);
// ----------------用户信息相关--------------------------------
/**

12
schoolNewsServ/auth/src/main/java/org/xyzh/auth/service/UserDetailsServiceImpl.java
View File

@@ -43,7 +43,11 @@ public class UserDetailsServiceImpl implements UserDetailsService {
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
TbSysUser filter = new TbSysUser();
filter.setUsername(username);
TbSysUser user = userService.getUserByFilter(filter).getData();
List<TbSysUser> users = userService.getUserByFilter(filter).getDataList();
if(users.isEmpty()) {
throw new UsernameNotFoundException("用户不存在: " + username);
}
TbSysUser user = users.get(0);
if (user == null) {
throw new UsernameNotFoundException("用户不存在: " + username);
@@ -62,7 +66,11 @@ public class UserDetailsServiceImpl implements UserDetailsService {
public UserDetails loadUserByUserId(String userId) {
TbSysUser filter = new TbSysUser();
filter.setID(userId);
TbSysUser user = userService.getUserByFilter(filter).getData();
List<TbSysUser> users = userService.getUserByFilter(filter).getDataList();
if(users.isEmpty()) {
throw new UsernameNotFoundException("用户不存在: " + userId);
}
TbSysUser user = users.get(0);
if (user == null) {
throw new UsernameNotFoundException("用户不存在: " + userId);

9
schoolNewsServ/auth/src/main/java/org/xyzh/auth/strategy/impl/EmailLoginStrategy.java
View File

@@ -2,6 +2,9 @@ package org.xyzh.auth.strategy.impl;
import org.springframework.stereotype.Component;
import org.springframework.security.crypto.password.PasswordEncoder;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.xyzh.auth.strategy.LoginStrategy;
import org.xyzh.common.core.domain.LoginParam;
@@ -39,7 +42,11 @@ public class EmailLoginStrategy implements LoginStrategy {
public TbSysUser findUser(LoginParam loginParam) {
TbSysUser filter = new TbSysUser();
filter.setEmail(loginParam.getEmail());
return userService.getUserByFilter(filter).getData();
List<TbSysUser> users = userService.getUserByFilter(filter).getDataList();
if(users.isEmpty()) {
return null;
}
return users.get(0);
}
@Override

9
schoolNewsServ/auth/src/main/java/org/xyzh/auth/strategy/impl/PasswordLoginStrategy.java
View File

@@ -8,6 +8,9 @@ import org.xyzh.common.core.domain.LoginParam;
import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.common.utils.NonUtils;
import org.xyzh.api.system.user.UserService;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,7 +62,11 @@ public class PasswordLoginStrategy implements LoginStrategy {
if (NonUtils.isNotEmpty(loginParam.getPhone())) {
filter.setPhone(loginParam.getPhone());
}
return userService.getUserByFilter(filter).getData();
List<TbSysUser> users = userService.getUserByFilter(filter).getDataList();
if(users.isEmpty()) {
return null;
}
return users.get(0);
}
@Override

8
schoolNewsServ/auth/src/main/java/org/xyzh/auth/strategy/impl/PhoneLoginStrategy.java
View File

@@ -8,6 +8,8 @@ import org.xyzh.common.core.domain.LoginParam;
import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.api.system.user.UserService;
import java.util.List;
/**
* @description PhoneLoginStrategy.java文件描述 手机号登录策略
* @filename PhoneLoginStrategy.java
@@ -39,7 +41,11 @@ public class PhoneLoginStrategy implements LoginStrategy {
public TbSysUser findUser(LoginParam loginParam) {
TbSysUser filter = new TbSysUser();
filter.setPhone(loginParam.getPhone());
return userService.getUserByFilter(filter).getData();
List<TbSysUser> users = userService.getUserByFilter(filter).getDataList();
if(users.isEmpty()) {
return null;
}
return users.get(0);
}
@Override

8
schoolNewsServ/auth/src/main/java/org/xyzh/auth/strategy/impl/UsernameLoginStrategy.java
View File

@@ -8,6 +8,8 @@ import org.xyzh.common.core.domain.LoginParam;
import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.api.system.user.UserService;
import java.util.List;
/**
* @description UsernameLoginStrategy.java文件描述 用户名登录策略
* @filename UsernameLoginStrategy.java
@@ -39,7 +41,11 @@ public class UsernameLoginStrategy implements LoginStrategy {
public TbSysUser findUser(LoginParam loginParam) {
TbSysUser filter = new TbSysUser();
filter.setUsername(loginParam.getUsername());
return userService.getUserByFilter(filter).getData();
List<TbSysUser> users = userService.getUserByFilter(filter).getDataList();
if(users.isEmpty()) {
return null;
}
return users.get(0);
}
@Override

8
schoolNewsServ/auth/src/main/java/org/xyzh/auth/strategy/impl/WechatLoginStrategy.java
View File

@@ -7,6 +7,8 @@ import org.xyzh.common.core.domain.LoginParam;
import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.api.system.user.UserService;
import java.util.List;
/**
* @description WechatLoginStrategy.java文件描述 微信登录策略
* @filename WechatLoginStrategy.java
@@ -35,7 +37,11 @@ public class WechatLoginStrategy implements LoginStrategy {
public TbSysUser findUser(LoginParam loginParam) {
TbSysUser filter = new TbSysUser();
filter.setWechatID(loginParam.getWechatID());
return userService.getUserByFilter(filter).getData();
List<TbSysUser> users = userService.getUserByFilter(filter).getDataList();
if(users.isEmpty()) {
return null;
}
return users.get(0);
}
@Override

52
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/dept/TbSysDeptRole.java
View File

@@ -40,6 +40,58 @@ public class TbSysDeptRole extends BaseDTO {
*/
public String updater;
public TbSysDeptRole() {
super();
}
public String getDeptID() {
return deptID;
}
public void setDeptID(String deptID) {
this.deptID = deptID;
}
public String getRoleID() {
return roleID;
}
public void setRoleID(String roleID) {
this.roleID = roleID;
}
public String getCreator() {
return creator;
}
public void setCreator(String creator) {
this.creator = creator;
}
public String getUpdater() {
return updater;
}
public void setUpdater(String updater) {
this.updater = updater;
}
@Override
public String toString() {
return "TbSysDeptRole{" +

32
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/DeptRoleVO.java
View File

@@ -2,12 +2,19 @@ package org.xyzh.common.vo;
import org.xyzh.common.dto.dept.TbSysDept;
import org.xyzh.common.dto.role.TbSysRole;
import org.xyzh.common.dto.user.TbSysUser;
import java.util.List;
public class DeptRoleVO {
private TbSysDept dept;
private TbSysRole role;
private List<TbSysDept> depts;
private List<TbSysRole> roles;
private List<TbSysUser> users;
public TbSysDept getDept() {
return dept;
}
@@ -23,4 +30,29 @@ public class DeptRoleVO {
public void setRole(TbSysRole role) {
this.role = role;
}
public List<TbSysDept> getDepts() {
return depts;
}
public void setDepts(List<TbSysDept> depts) {
this.depts = depts;
}
public List<TbSysRole> getRoles() {
return roles;
}
public void setRoles(List<TbSysRole> roles) {
this.roles = roles;
}
public List<TbSysUser> getUsers() {
return users;
}
public void setUsers(List<TbSysUser> users) {
this.users = users;
}
}

51
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/UserDeptRoleVO.java Normal file
View File

@@ -0,0 +1,51 @@
package org.xyzh.common.vo;
import java.util.List;
import org.xyzh.common.dto.BaseDTO;
import org.xyzh.common.dto.dept.TbSysDept;
import org.xyzh.common.dto.role.TbSysRole;
import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.common.dto.user.TbSysUserDeptRole;
public class UserDeptRoleVO extends BaseDTO{
private TbSysUser user;
private List<TbSysUser> users;
private List<TbSysDept> depts;
private List<TbSysRole> roles;
private List<TbSysUserDeptRole> userDeptRoles;
public TbSysUser getUser() {
return user;
}
public void setUser(TbSysUser user) {
this.user = user;
}
public List<TbSysUser> getUsers() {
return users;
}
public void setUsers(List<TbSysUser> users) {
this.users = users;
}
public List<TbSysDept> getDepts() {
return depts;
}
public void setDepts(List<TbSysDept> depts) {
this.depts = depts;
}
public List<TbSysRole> getRoles() {
return roles;
}
public void setRoles(List<TbSysRole> roles) {
this.roles = roles;
}
public List<TbSysUserDeptRole> getUserDeptRoles() {
return userDeptRoles;
}
public void setUserDeptRoles(List<TbSysUserDeptRole> userDeptRoles) {
this.userDeptRoles = userDeptRoles;
}
}

151
schoolNewsServ/system/src/main/java/org/xyzh/system/controller/DeptController.java Normal file
View File

@@ -0,0 +1,151 @@
package org.xyzh.system.controller;
import java.util.List;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.xyzh.api.system.dept.DepartmentService;
import org.xyzh.common.core.domain.ResultDomain;
import org.xyzh.common.dto.dept.TbSysDept;
import org.xyzh.common.dto.dept.TbSysDeptRole;
import org.xyzh.common.dto.role.TbSysRole;
import org.xyzh.common.vo.DeptRoleVO;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.RequestMapping;
@RestController
@RequestMapping("/depts")
public class DeptController {
private static final Logger logger = LoggerFactory.getLogger(DeptController.class);
@Autowired
private DepartmentService deptService;
/**
* @description 查询所有部门
* @return ResultDomain<TbSysDept> 部门列表
* @author yslg
* @since 2025-10-06
*/
@PostMapping("/all")
public ResultDomain<TbSysDept> getAllDepts() {
return deptService.getAllDepartments();
}
/**
* @description 查询部门列表
* @param filter 过滤条件
* @return ResultDomain<TbSysDept> 部门列表
* @author yslg
* @since 2025-10-06
*/
@PostMapping("/list")
public ResultDomain<TbSysDept> getDeptList(@RequestBody TbSysDept filter) {
return deptService.getDeptList(filter);
}
/**
* @description 查询部门
* @param deptId 部门ID
* @return ResultDomain<TbSysDept> 部门信息
* @author yslg
* @since 2025-10-06
*/
@PostMapping("/id")
public ResultDomain<TbSysDept> getDeptById(@RequestBody TbSysDept dept) {
return deptService.getDepartmentById(dept.getDeptID());
}
/**
* @description 创建部门
* @param dept 部门信息
* @return ResultDomain<TbSysDept> 部门信息
* @author yslg
* @since 2025-10-06
*/
@PostMapping("/dept")
public ResultDomain<TbSysDept> createDept(@RequestBody TbSysDept dept) {
return deptService.createDepartment(dept);
}
/**
* @description 更新部门
* @param dept 部门信息
* @return ResultDomain<TbSysDept> 部门信息
* @author yslg
* @since 2025-10-06
*/
@PutMapping("/dept")
public ResultDomain<TbSysDept> updateDept(@RequestBody TbSysDept dept) {
return deptService.updateDepartment(dept);
}
/**
* @description 删除部门
* @param dept 部门信息
* @return ResultDomain<TbSysDept> 部门信息
* @author yslg
* @since 2025-10-06
*/
@DeleteMapping("/dept")
public ResultDomain<TbSysDept> deleteDept(@RequestBody TbSysDept dept) {
return deptService.deleteDepartment(dept.getDeptID());
}
/**
* @description 查询部门绑定角色
* @param dept 部门信息
* @return ResultDomain<TbSysRole> 角色信息
* @author yslg
* @since 2025-10-06
*/
@PostMapping("/role")
public ResultDomain<TbSysRole> getDeptByRole(@RequestBody TbSysDept dept) {
return deptService.getDeptByRole(dept.getDeptID());
}
/**
* @description 查询部门绑定角色
* @param dept 部门信息
* @return ResultDomain<TbSysRole> 角色信息
* @author yslg
* @since 2025-10-06
*/
@PostMapping("/role/list")
public ResultDomain<TbSysDeptRole> getDeptByRoleList() {
return deptService.getDeptByRoleList();
}
/**
* @description 绑定部门角色
* @param dept 部门信息
* @return ResultDomain<TbSysDeptRole> 部门角色信息
* @author yslg
* @since 2025-10-06
*/
@PostMapping("/bind/role")
public ResultDomain<TbSysDeptRole> bindDeptRole(@RequestBody DeptRoleVO deptRole) {
List<String> deptIDs = deptRole.getDepts().stream().map(TbSysDept::getDeptID).collect(Collectors.toList());
List<String> roleIDs = deptRole.getRoles().stream().map(TbSysRole::getRoleID).collect(Collectors.toList());
return deptService.bindDeptRole(deptIDs, roleIDs);
}
/**
* @description 解绑部门角色
* @param dept 部门信息
* @return ResultDomain<TbSysDeptRole> 部门角色信息
* @author yslg
* @since 2025-10-06
*/
@PostMapping("/unbind/role")
public ResultDomain<TbSysDeptRole> unbindDeptRole(@RequestBody DeptRoleVO deptRole) {
List<String> deptIDs = deptRole.getDepts().stream().map(TbSysDept::getDeptID).collect(Collectors.toList());
List<String> roleIDs = deptRole.getRoles().stream().map(TbSysRole::getRoleID).collect(Collectors.toList());
return deptService.unbindDeptRole(deptIDs, roleIDs);
}
}

80
schoolNewsServ/system/src/main/java/org/xyzh/system/controller/RoleController.java
View File

@@ -3,12 +3,18 @@ package org.xyzh.system.controller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.xyzh.api.system.role.RoleService;
import org.xyzh.common.core.domain.ResultDomain;
import org.xyzh.common.dto.permission.TbSysPermission;
import org.xyzh.common.dto.role.TbSysRole;
import org.xyzh.common.dto.role.TbSysRolePermission;
import org.xyzh.common.vo.DeptRoleVO;
/**
* @description RoleController.java文件描述 角色控制器
@@ -35,4 +41,78 @@ public class RoleController {
public ResultDomain<TbSysRole> all() {
return roleService.getAllRoles();
}
/**
* @description 根据角色ID获取角色
* @param role 角色信息
* @return ResultDomain<TbSysRole> 角色信息
* @author yslg
* @since 2025-10-09
*/
@PostMapping("/id")
public ResultDomain<TbSysRole> getRoleById(@RequestBody TbSysRole role) {
return roleService.getRoleById(role.getRoleID());
}
/**
* @description 根据过滤条件获取角色列表
* @param filter 过滤条件
* @return ResultDomain<TbSysRole> 角色列表
* @author yslg
* @since 2025-10-09
*/
@PostMapping("/list")
public ResultDomain<TbSysRole> getRoleList(@RequestBody TbSysRole filter) {
return roleService.getRoleList(filter);
}
/**
* @description 创建角色
* @param role 角色信息
* @return ResultDomain<TbSysRole> 角色信息
* @author yslg
* @since 2025-10-09
*/
@PostMapping("/role")
public ResultDomain<TbSysRole> createRole(@RequestBody TbSysRole role) {
return roleService.createRole(role);
}
/**
* @description 更新角色
* @param role 角色信息
* @return ResultDomain<TbSysRole> 角色信息
* @author yslg
* @since 2025-10-09
*/
@PutMapping("/role")
public ResultDomain<TbSysRole> updateRole(@RequestBody TbSysRole role) {
return roleService.updateRole(role);
}
/**
* @description 删除角色
* @param role 角色信息
* @return ResultDomain<TbSysRole> 角色信息
* @author yslg
* @since 2025-10-09
*/
@DeleteMapping("/role")
public ResultDomain<TbSysRole> deleteRole(@RequestBody TbSysRole role) {
return roleService.deleteRole(role);
}
/**
* @description 获取角色权限
* @param role 角色信息
* @return ResultDomain<TbSysRolePermission> 角色权限信息
* @author yslg
* @since 2025-10-09
*/
@PostMapping("/permission")
public ResultDomain<TbSysPermission> getRolePermission(@RequestBody TbSysRole role) {
return roleService.getRolePermission(role.getRoleID());
}
}

86
schoolNewsServ/system/src/main/java/org/xyzh/system/controller/UserController.java
View File

@@ -13,7 +13,10 @@ import org.xyzh.common.annotation.HttpLogin;
import org.xyzh.common.core.domain.LoginDomain;
import org.xyzh.common.core.domain.ResultDomain;
import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.common.dto.user.TbSysUserDeptRole;
import org.xyzh.common.dto.user.TbSysUserInfo;
import org.xyzh.common.vo.UserDeptRoleVO;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -25,7 +28,7 @@ import org.springframework.web.bind.annotation.GetMapping;
* @ since 2025-10-06
*/
@RestController
@RequestMapping("/user")
@RequestMapping("/users")
public class UserController {
private static final Logger logger = LoggerFactory.getLogger(UserController.class);
@@ -35,14 +38,93 @@ public class UserController {
// ---------------- 用户 ----------------
/**
* @description 注册用户
* @param
* @author yslg
* @since 2025-10-09
*/
@PostMapping("/register")
public ResultDomain<TbSysUser> registerUser(@RequestBody TbSysUser user){
return userService.registerUser(user);
}
/**
* @description 创建用户
* @param user
* @author yslg
* @since 2025-10-09
*/
@PostMapping("/user")
public ResultDomain<TbSysUser> createUser(@RequestBody TbSysUser user) {
return userService.createUser(user);
}
/**
* @description 更新用户
* @param user
* @author yslg
* @since 2025-10-09
*/
@PutMapping("/user")
public ResultDomain<TbSysUser> updateUser(@RequestBody TbSysUser user) {
return userService.updateUser(user);
}
/**
* @description 删除用户
* @param user
* @author yslg
* @since 2025-10-09
*/
@DeleteMapping("/user")
public ResultDomain<TbSysUser> deleteUser(@RequestBody TbSysUser user) {
return userService.deleteUser(user.getID());
}
/**
* @description 获取用户
* @param filter
* @author yslg
* @since 2025-10-09
*/
@PostMapping("/list")
public ResultDomain<TbSysUser> getUserList(@RequestBody TbSysUser filter) {
return userService.getUserByFilter(filter);
}
/**
* @description 绑定用户部门角色
* @param filter
* @author yslg
* @since 2025-10-09
*/
@PostMapping("/bind/deptrole/list")
public ResultDomain<TbSysUserDeptRole> getBindUserDeptRoleList(@RequestBody TbSysUserDeptRole filter) {
return userService.getBindUserDeptRoleList(filter);
}
/**
* @description 绑定用户部门角色
* @param filter
* @author yslg
* @since 2025-10-09
*/
@PostMapping("/bind/deptrole")
public ResultDomain<UserDeptRoleVO> bindUserDeptRole(@RequestBody UserDeptRoleVO userDeptRoleVO) {
return userService.bindUserDeptRole(userDeptRoleVO);
}
/**
* @description 解绑用户部门角色
* @param filter
* @author yslg
* @since 2025-10-09
*/
@PostMapping("/unbind/deptrole")
public ResultDomain<UserDeptRoleVO> unbindUserDeptRole(@RequestBody UserDeptRoleVO userDeptRoleVO) {
return userService.unbindUserDeptRole(userDeptRoleVO);
}

149
schoolNewsServ/system/src/main/java/org/xyzh/system/department/service/impl/SysDepartmentServiceImpl.java
View File

@@ -1,6 +1,5 @@
package org.xyzh.system.department.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -8,11 +7,17 @@ import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.xyzh.common.core.domain.ResultDomain;
import org.xyzh.common.dto.dept.TbSysDept;
import org.xyzh.common.dto.dept.TbSysDeptRole;
import org.xyzh.common.dto.role.TbSysRole;
import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.common.utils.IDUtils;
import org.xyzh.system.department.service.SysDepartmentService;
import org.xyzh.system.mapper.DepartmentMapper;
import org.xyzh.system.mapper.DeptRoleMapper;
import org.xyzh.system.utils.LoginUtil;
import java.util.List;
import java.util.ArrayList;
import java.util.Date;
/**
@@ -30,18 +35,18 @@ public class SysDepartmentServiceImpl implements SysDepartmentService {
@Autowired
private DepartmentMapper departmentMapper;
@Autowired
private DeptRoleMapper deptRoleMapper;
@Override
public ResultDomain<TbSysDept> getAllDepartments() {
ResultDomain<TbSysDept> resultDomain = new ResultDomain<>();
try {
logger.info("开始查询所有部门");
LambdaQueryWrapper<TbSysDept> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TbSysDept::getDeleted, false)
.orderByAsc(TbSysDept::getCreateTime);
List<TbSysDept> departments = departmentMapper.selectList(queryWrapper);
TbSysDept filter = new TbSysDept();
filter.setDeleted(false);
List<TbSysDept> departments = departmentMapper.selectDepts(filter);
logger.info("查询所有部门完成，共找到{}个部门", departments.size());
resultDomain.success("查询成功", departments);
@@ -54,6 +59,34 @@ public class SysDepartmentServiceImpl implements SysDepartmentService {
}
}
@Override
public ResultDomain<TbSysDept> getDeptList(TbSysDept filter) {
ResultDomain<TbSysDept> resultDomain = new ResultDomain<>();
try {
logger.info("开始查询部门列表");
List<TbSysDept> departments = departmentMapper.selectDepts(filter);
if (departments.isEmpty()) {
resultDomain.fail("未找到部门");
return resultDomain;
}
resultDomain.success("查询成功", departments);
return resultDomain;
} catch (Exception e) {
logger.error("查询部门列表失败", e);
resultDomain.fail("查询部门列表失败：" + e.getMessage());
return resultDomain;
}
}
@Override
public ResultDomain<TbSysDeptRole> getDeptByRoleList() {
ResultDomain<TbSysDeptRole> resultDomain = new ResultDomain<>();
List<TbSysDeptRole> deptRoles = deptRoleMapper.selectDeptRoleList();
resultDomain.success("查询成功", deptRoles);
return resultDomain;
}
@Override
public ResultDomain<TbSysDept> getDepartmentById(String deptId) {
ResultDomain<TbSysDept> resultDomain = new ResultDomain<>();
@@ -65,11 +98,10 @@ public class SysDepartmentServiceImpl implements SysDepartmentService {
return resultDomain;
}
LambdaQueryWrapper<TbSysDept> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TbSysDept::getDeptID, deptId)
.eq(TbSysDept::getDeleted, false);
TbSysDept department = departmentMapper.selectOne(queryWrapper);
TbSysDept filter = new TbSysDept();
filter.setDeptID(deptId);
List<TbSysDept> departments = departmentMapper.selectDepts(filter);
TbSysDept department = departments.isEmpty() ? null : departments.get(0);
if (department == null) {
logger.warn("未找到部门：{}", deptId);
@@ -137,7 +169,7 @@ public class SysDepartmentServiceImpl implements SysDepartmentService {
department.setDeleted(false);
// 插入数据库
int result = departmentMapper.insert(department);
int result = departmentMapper.insertDept(department);
if (result > 0) {
logger.info("创建部门成功：{}", department.getName());
@@ -194,7 +226,7 @@ public class SysDepartmentServiceImpl implements SysDepartmentService {
department.setUpdateTime(new Date());
// 更新数据库
int result = departmentMapper.updateById(department);
int result = departmentMapper.updateDept(department);
if (result > 0) {
logger.info("更新部门成功：{}", department.getDeptID());
@@ -243,7 +275,7 @@ public class SysDepartmentServiceImpl implements SysDepartmentService {
department.setDeleted(true);
department.setDeleteTime(new Date());
int result = departmentMapper.updateById(department);
int result = departmentMapper.deleteDept(department);
if (result > 0) {
logger.info("删除部门成功：{}", deptId);
@@ -286,4 +318,91 @@ public class SysDepartmentServiceImpl implements SysDepartmentService {
return resultDomain;
}
}
@Override
public ResultDomain<TbSysRole> getDeptByRole(String deptId) {
ResultDomain<TbSysRole> resultDomain = new ResultDomain<>();
try {
logger.info("开始查询部门绑定角色：{}", deptId);
List<TbSysRole> roles = deptRoleMapper.selectDeptRole(deptId);
resultDomain.success("查询成功", roles);
return resultDomain;
} catch (Exception e) {
logger.error("查询部门绑定角色失败", e);
resultDomain.fail("查询部门绑定角色失败：" + e.getMessage());
return resultDomain;
}
}
@Override
public ResultDomain<TbSysDeptRole> bindDeptRole(List<String> deptIDs, List<String> roleIDs) {
ResultDomain<TbSysDeptRole> resultDomain = new ResultDomain<>();
TbSysUser user = LoginUtil.getCurrentUser();
if (user == null) {
resultDomain.fail("当前用户未登录");
return resultDomain;
}
try {
logger.info("开始绑定部门角色：{}", deptIDs);
List<TbSysDeptRole> deptRoles = new ArrayList<>();
Date now = new Date();
for (String deptID : deptIDs) {
for (String roleID : roleIDs) {
TbSysDeptRole deptRole = new TbSysDeptRole();
deptRole.setID(IDUtils.generateID());
deptRole.setDeptID(deptID);
deptRole.setRoleID(roleID);
deptRole.setCreateTime(now);
deptRole.setDeleted(false);
deptRole.setCreator(user.getID());
deptRoles.add(deptRole);
}
}
int result = deptRoleMapper.batchBindDeptRole(deptRoles);
if (result > 0) {
logger.info("绑定部门角色成功：{}", deptIDs);
resultDomain.success("绑定部门角色成功", deptRoles);
return resultDomain;
} else {
logger.warn("绑定部门角色失败：{}", deptIDs);
resultDomain.fail("绑定部门角色失败");
return resultDomain;
}
} catch (Exception e) {
logger.error("绑定部门角色失败", e);
resultDomain.fail("绑定部门角色失败：" + e.getMessage());
return resultDomain;
}
}
@Override
public ResultDomain<TbSysDeptRole> unbindDeptRole(List<String> deptIDs, List<String> roleIDs) {
ResultDomain<TbSysDeptRole> resultDomain = new ResultDomain<>();
try {
logger.info("开始解绑部门角色：{}", deptIDs);
List<TbSysDeptRole> deptRoles = new ArrayList<>();
for (String deptID : deptIDs) {
for (String roleID : roleIDs) {
TbSysDeptRole deptRole = new TbSysDeptRole();
deptRole.setDeptID(deptID);
deptRole.setRoleID(roleID);
deptRoles.add(deptRole);
}
}
int result = deptRoleMapper.batchUnbindDeptRole(deptRoles);
if (result > 0) {
logger.info("解绑部门角色成功：{}", deptIDs);
resultDomain.success("解绑部门角色成功", deptRoles);
return resultDomain;
} else {
logger.warn("解绑部门角色失败：{}", deptIDs);
resultDomain.fail("解绑部门角色失败");
return resultDomain;
}
} catch (Exception e) {
logger.error("解绑部门角色失败", e);
resultDomain.fail("解绑部门角色失败：" + e.getMessage());
return resultDomain;
}
}
}

34
schoolNewsServ/system/src/main/java/org/xyzh/system/mapper/DepartmentMapper.java
View File

@@ -17,6 +17,15 @@ import java.util.List;
@Mapper
public interface DepartmentMapper extends BaseMapper<TbSysDept> {
/**
* @description 查询部门列表
* @param filter 过滤条件
* @return List<TbSysDept> 部门列表
* @author yslg
* @since 2025-10-06
*/
List<TbSysDept> selectDepts(TbSysDept filter);
/**
* @description 根据父部门ID查询子部门列表
* @param parentId 父部门ID
@@ -54,12 +63,29 @@ public interface DepartmentMapper extends BaseMapper<TbSysDept> {
List<TbSysDept> selectDeptTree();
/**
* @description 批量删除部门（逻辑删除）
* @param deptIds 部门ID列表
* @param updater 更新人
* @description 插入部门
* @param department 部门
* @return int 影响行数
* @author yslg
* @since 2025-09-28
*/
int batchDeleteByIds(@Param("deptIds") List<String> deptIds, @Param("updater") String updater);
int insertDept(TbSysDept department);
/**
* @description 更新部门
* @param department 部门
* @return int 影响行数
* @author yslg
* @since 2025-09-28
*/
int updateDept(TbSysDept department);
/**
* @description 删除部门
* @param department 部门
* @return int 影响行数
* @author yslg
* @since 2025-09-28
*/
int deleteDept(TbSysDept department);
}

42
schoolNewsServ/system/src/main/java/org/xyzh/system/mapper/DeptRoleMapper.java Normal file
View File

@@ -0,0 +1,42 @@
package org.xyzh.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.xyzh.common.dto.dept.TbSysDeptRole;
import org.xyzh.common.dto.role.TbSysRole;
@Mapper
public interface DeptRoleMapper extends BaseMapper<TbSysDeptRole> {
/**
* @description 查询部门绑定角色
* @param deptId 部门ID
* @return List<TbSysRole> 角色列表
* @author yslg
* @since 2025-09-28
*/
List<TbSysRole> selectDeptRole(String deptId);
/**
* @description 查询部门绑定角色
* @return List<TbSysDeptRole> 部门角色列表
* @author yslg
* @since 2025-10-06
*/
List<TbSysDeptRole> selectDeptRoleList();
/**
* @description 批量绑定部门角色
* @param deptRoles 部门角色列表
* @return int 影响行数
* @author yslg
* @since 2025-09-28
*/
int batchBindDeptRole(@Param("deptRoles") List<TbSysDeptRole> deptRoles);
int batchUnbindDeptRole(@Param("deptRoles") List<TbSysDeptRole> deptRoles);
}

36
schoolNewsServ/system/src/main/java/org/xyzh/system/mapper/RoleMapper.java
View File

@@ -26,6 +26,42 @@ public interface RoleMapper extends BaseMapper<TbSysRole> {
*/
List<TbSysRole> selectAllRoles();
/**
* @description 根据过滤条件查询角色列表
* @param filter 过滤条件
* @return List<TbSysRole> 角色列表
* @author yslg
* @since 2025-10-09
*/
List<TbSysRole> selectRole(TbSysRole filter);
/**
* @description 插入角色
* @param role 角色
* @return int 影响行数
* @author yslg
* @since 2025-10-09
*/
int insertRole(TbSysRole role);
/**
* @description 更新角色
* @param role 角色
* @return int 影响行数
* @author yslg
* @since 2025-10-09
*/
int updateRole(TbSysRole role);
/**
* @description 删除角色
* @param role 角色
* @return int 影响行数
* @author yslg
* @since 2025-10-09
*/
int deleteRole(TbSysRole role);
/**
* @description 根据用户ID查询角色列表
* @param userId 用户ID

3
schoolNewsServ/system/src/main/java/org/xyzh/system/mapper/RolePermissionMapper.java
View File

@@ -3,6 +3,7 @@ package org.xyzh.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.xyzh.common.dto.permission.TbSysPermission;
import org.xyzh.common.dto.role.TbSysRolePermission;
import java.util.List;
@@ -53,7 +54,7 @@ public interface RolePermissionMapper extends BaseMapper<TbSysRolePermission> {
* @author yslg
* @since 2025-10-07
*/
List<TbSysRolePermission> selectByRoleId(@Param("roleId") String roleId);
List<TbSysPermission> selectByRoleId(@Param("roleId") String roleId);
/**
* @description 根据权限ID查询角色关联列表

29
schoolNewsServ/system/src/main/java/org/xyzh/system/mapper/UserDeptRoleMapper.java
View File

@@ -1,10 +1,39 @@
package org.xyzh.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.xyzh.common.dto.user.TbSysUserDeptRole;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Mapper
public interface UserDeptRoleMapper extends BaseMapper<TbSysUserDeptRole> {
/**
* @description 查询用户部门角色
* @param userId 用户ID
* @return List<TbSysUserDeptRole> 用户部门角色列表
* @author yslg
* @since 2025-10-09
*/
List<TbSysUserDeptRole> selectByFilter(TbSysUserDeptRole filter);
/**
* @description 绑定用户
* @param userDeptRoles 用户角色列表
* @return int 影响行数
* @author yslg
* @since 2025-10-09
*/
int bindUser(@Param("userDeptRoles") List<TbSysUserDeptRole> userDeptRoles);
/**
* @description 解绑用户
* @param userDeptRoles 用户角色列表
* @return int 影响行数
* @author yslg
* @since 2025-10-09
*/
int unbindUser(@Param("userDeptRoles") List<TbSysUserDeptRole> userDeptRoles);
}

27
schoolNewsServ/system/src/main/java/org/xyzh/system/mapper/UserInfoMapper.java
View File

@@ -1,10 +1,37 @@
package org.xyzh.system.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.xyzh.common.dto.user.TbSysUserInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Mapper
public interface UserInfoMapper extends BaseMapper<TbSysUserInfo> {
/**
* @description 插入用户信息
* @param userInfo 用户信息
* @return int 影响行数
* @author yslg
* @since 2025-10-06
*/
int insertUserInfo(@Param("userInfo") TbSysUserInfo userInfo);
/**
* @description 更新用户信息
* @param userInfo 用户信息
* @return int 影响行数
* @author yslg
* @since 2025-10-06
*/
int updateUserInfo(@Param("userInfo") TbSysUserInfo userInfo);
/**
* @description 删除用户信息
* @param userId 用户ID
* @return int 影响行数
* @author yslg
* @since 2025-10-06
*/
int deleteUserInfo(@Param("userID") String userId);
}

29
schoolNewsServ/system/src/main/java/org/xyzh/system/mapper/UserMapper.java
View File

@@ -18,6 +18,33 @@ import java.util.List;
@Mapper
public interface UserMapper extends BaseMapper<TbSysUser> {
/**
* @description 插入用户
* @param user 用户信息
* @return int 影响行数
* @author yslg
* @since 2025-10-06
*/
int insertUser(@Param("user") TbSysUser user);
/**
* @description 更新用户
* @param user 用户信息
* @return int 影响行数
* @author yslg
* @since 2025-10-06
*/
int updateUser(@Param("user") TbSysUser user);
/**
* @description 删除用户
* @param userID 用户ID
* @return int 影响行数
* @author yslg
* @since 2025-10-06
*/
int deleteUser(@Param("userID") String userID);
/**
* @description 根据用户名查询用户
* @param username 用户名
@@ -52,7 +79,7 @@ public interface UserMapper extends BaseMapper<TbSysUser> {
* @author yslg
* @since 2025-09-28
*/
TbSysUser selectByFilter(@Param("filter") TbSysUser filter);
List<TbSysUser> selectByFilter(@Param("filter") TbSysUser filter);
/**
* @description 查询用户列表（分页）

171
schoolNewsServ/system/src/main/java/org/xyzh/system/role/service/impl/SysRoleServiceImpl.java
View File

@@ -1,17 +1,18 @@
package org.xyzh.system.role.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.xyzh.common.core.domain.ResultDomain;
import org.xyzh.common.dto.dept.TbSysDeptRole;
import org.xyzh.common.dto.permission.TbSysPermission;
import org.xyzh.common.dto.role.TbSysRole;
import org.xyzh.common.utils.IDUtils;
import org.xyzh.common.vo.DeptRoleVO;
import org.xyzh.system.mapper.RolePermissionMapper;
import org.xyzh.system.mapper.RoleMapper;
import org.xyzh.system.mapper.UserDeptRoleMapper;
import org.xyzh.system.role.service.SysRoleService;
import java.util.Date;
@@ -32,6 +33,12 @@ public class SysRoleServiceImpl implements SysRoleService {
@Autowired
private RoleMapper roleMapper;
@Autowired
private RolePermissionMapper rolePermissionMapper;
@Autowired
private UserDeptRoleMapper userDeptRoleMapper;
@Override
public ResultDomain<TbSysRole> getAllRoles() {
ResultDomain<TbSysRole> resultDomain = new ResultDomain<>();
@@ -53,58 +60,19 @@ public class SysRoleServiceImpl implements SysRoleService {
}
@Override
public ResultDomain<TbSysRole> getRoleById(String roleId) {
public ResultDomain<TbSysRole> getRoleList(TbSysRole filter) {
ResultDomain<TbSysRole> resultDomain = new ResultDomain<>();
try {
logger.info("开始根据ID查询角色：{}", roleId);
logger.info("开始根据过滤条件查询角色列表：{}", filter);
if (!StringUtils.hasText(roleId)) {
resultDomain.fail("角色ID不能为空");
return resultDomain;
}
List<TbSysRole> roles = roleMapper.selectRole(filter);
LambdaQueryWrapper<TbSysRole> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TbSysRole::getRoleID, roleId)
.eq(TbSysRole::getDeleted, false);
TbSysRole role = roleMapper.selectOne(queryWrapper);
if (role == null) {
logger.warn("未找到角色：{}", roleId);
resultDomain.fail("未找到指定角色");
return resultDomain;
}
logger.info("根据ID查询角色完成：{}", roleId);
resultDomain.success("查询成功", role);
return resultDomain;
} catch (Exception e) {
logger.error("根据ID查询角色失败：{}", roleId, e);
resultDomain.fail("查询角色失败：" + e.getMessage());
return resultDomain;
}
}
@Override
public ResultDomain<DeptRoleVO> getDeptRolesByUserId(String userId) {
ResultDomain<DeptRoleVO> resultDomain = new ResultDomain<>();
try {
logger.info("开始根据用户ID查询部门角色列表：{}", userId);
if (!StringUtils.hasText(userId)) {
resultDomain.fail("用户ID不能为空");
return resultDomain;
}
List<DeptRoleVO> roles = roleMapper.selectDeptRolesByUserId(userId);
logger.info("根据用户ID查询部门角色列表完成，共找到{}个部门角色", roles.size());
logger.info("查询角色列表完成，共找到{}个角色", roles.size());
resultDomain.success("查询成功", roles);
return resultDomain;
} catch (Exception e) {
logger.error("根据用户ID查询部门角色列表失败：{}", userId, e);
logger.error("根据过滤条件查询角色列表失败：{}", filter, e);
resultDomain.fail("查询角色失败：" + e.getMessage());
return resultDomain;
}
@@ -141,7 +109,7 @@ public class SysRoleServiceImpl implements SysRoleService {
role.setDeleted(false);
// 插入数据库
int result = roleMapper.insert(role);
int result = roleMapper.insertRole(role);
if (result > 0) {
logger.info("创建角色成功：{}", role.getName());
@@ -198,7 +166,7 @@ public class SysRoleServiceImpl implements SysRoleService {
role.setUpdateTime(new Date());
// 更新数据库
int result = roleMapper.updateById(role);
int result = roleMapper.updateRole(role);
if (result > 0) {
logger.info("更新角色成功：{}", role.getRoleID());
@@ -218,49 +186,100 @@ public class SysRoleServiceImpl implements SysRoleService {
}
@Override
public ResultDomain<TbSysRole> deleteRole(String roleId) {
public ResultDomain<TbSysRole> deleteRole(TbSysRole role) {
ResultDomain<TbSysRole> resultDomain = new ResultDomain<>();
try {
logger.info("开始删除角色：{}", roleId);
logger.info("开始删除角色：{}", role.getRoleID());
if (!StringUtils.hasText(roleId)) {
if (!StringUtils.hasText(role.getRoleID())) {
resultDomain.fail("角色ID不能为空");
return resultDomain;
}
// 检查角色是否存在
ResultDomain<TbSysRole> existResult = getRoleById(roleId);
ResultDomain<TbSysRole> existResult = getRoleById(role.getRoleID());
if (!existResult.isSuccess()) {
resultDomain.fail(existResult.getMessage());
return resultDomain;
}
// TODO: 检查角色是否被用户使用，如果被使用则不能删除
// 逻辑删除
TbSysRole role = existResult.getData();
role.setDeleted(true);
role.setDeleteTime(new Date());
int result = roleMapper.updateById(role);
int result = roleMapper.deleteRole(role);
if (result > 0) {
logger.info("删除角色成功：{}", roleId);
logger.info("删除角色成功：{}", role.getRoleID());
resultDomain.success("删除角色成功", role);
return resultDomain;
} else {
logger.warn("删除角色失败：{}", roleId);
logger.warn("删除角色失败：{}", role.getRoleID());
resultDomain.fail("删除角色失败");
return resultDomain;
}
} catch (Exception e) {
logger.error("删除角色异常：{}", roleId, e);
logger.error("删除角色异常：{}", role.getRoleID(), e);
resultDomain.fail("删除角色失败：" + e.getMessage());
return resultDomain;
}
}
@Override
public ResultDomain<TbSysRole> getRoleById(String roleId) {
ResultDomain<TbSysRole> resultDomain = new ResultDomain<>();
try {
logger.info("开始根据ID查询角色：{}", roleId);
if (!StringUtils.hasText(roleId)) {
resultDomain.fail("角色ID不能为空");
return resultDomain;
}
TbSysRole filter = new TbSysRole();
filter.setRoleID(roleId);
filter.setDeleted(false);
List<TbSysRole> roles = roleMapper.selectRole(filter);
TbSysRole role = roles.isEmpty() ? null : roles.get(0);
if (role == null) {
logger.warn("未找到角色：{}", roleId);
resultDomain.fail("未找到指定角色");
return resultDomain;
}
logger.info("根据ID查询角色完成：{}", roleId);
resultDomain.success("查询成功", role);
return resultDomain;
} catch (Exception e) {
logger.error("根据ID查询角色失败：{}", roleId, e);
resultDomain.fail("查询角色失败：" + e.getMessage());
return resultDomain;
}
}
@Override
public ResultDomain<DeptRoleVO> getDeptRolesByUserId(String userId) {
ResultDomain<DeptRoleVO> resultDomain = new ResultDomain<>();
try {
logger.info("开始根据用户ID查询部门角色列表：{}", userId);
if (!StringUtils.hasText(userId)) {
resultDomain.fail("用户ID不能为空");
return resultDomain;
}
List<DeptRoleVO> roles = roleMapper.selectDeptRolesByUserId(userId);
logger.info("根据用户ID查询部门角色列表完成，共找到{}个部门角色", roles.size());
resultDomain.success("查询成功", roles);
return resultDomain;
} catch (Exception e) {
logger.error("根据用户ID查询部门角色列表失败：{}", userId, e);
resultDomain.fail("查询角色失败：" + e.getMessage());
return resultDomain;
}
}
@Override
public ResultDomain<Boolean> checkRoleNameExists(String roleName, String excludeId) {
ResultDomain<Boolean> resultDomain = new ResultDomain<>();
@@ -312,7 +331,7 @@ public class SysRoleServiceImpl implements SysRoleService {
TbSysRole role = existResult.getData();
role.setUpdateTime(new Date());
int result = roleMapper.updateById(role);
int result = roleMapper.updateRole(role);
if (result > 0) {
logger.info("修改角色状态成功：{}", roleId);
@@ -330,4 +349,28 @@ public class SysRoleServiceImpl implements SysRoleService {
return resultDomain;
}
}
@Override
public ResultDomain<TbSysPermission> getRolePermission(String roleId) {
ResultDomain<TbSysPermission> resultDomain = new ResultDomain<>();
try {
logger.info("开始获取角色权限：{}", roleId);
if (!StringUtils.hasText(roleId)) {
resultDomain.fail("角色ID不能为空");
return resultDomain;
}
List<TbSysPermission> rolePermissions = rolePermissionMapper.selectByRoleId(roleId);
logger.info("获取角色权限完成：{}", roleId);
resultDomain.success("获取角色权限成功", rolePermissions);
return resultDomain;
} catch (Exception e) {
logger.error("获取角色权限异常：{}", roleId, e);
resultDomain.fail("获取角色权限失败：" + e.getMessage());
return resultDomain;
}
}
}

170
schoolNewsServ/system/src/main/java/org/xyzh/system/user/service/impl/SysUserServiceImpl.java
View File

@@ -1,6 +1,5 @@
package org.xyzh.system.user.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,13 +11,17 @@ import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.common.dto.user.TbSysUserDeptRole;
import org.xyzh.common.dto.user.TbSysUserInfo;
import org.xyzh.common.utils.IDUtils;
import org.xyzh.common.vo.UserDeptRoleVO;
import org.xyzh.system.mapper.UserMapper;
import org.xyzh.system.mapper.UserInfoMapper;
import org.xyzh.system.mapper.UserDeptRoleMapper;
import org.xyzh.system.user.service.SysUserService;
import org.xyzh.system.utils.LoginUtil;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import java.util.Arrays;
/**
* @description SysUserServiceImpl.java文件描述 系统用户服务实现类
@@ -54,22 +57,26 @@ public class SysUserServiceImpl implements SysUserService {
resultDomain.fail("用户已存在");
return resultDomain;
}
Date now = new Date();
user.setID(IDUtils.generateID());
user.setCreateTime(now);
user.setDeleted(false);
// 创建用户信息
TbSysUserInfo userInfo = new TbSysUserInfo();
userInfo.setUserID(user.getID());
userInfo.setCreateTime(new Date());
userInfo.setCreateTime(now);
userInfo.setAvatar("default");
TbSysUserDeptRole userDeptRole = new TbSysUserDeptRole();
userDeptRole.setUserID(user.getID());
userDeptRole.setDeptID("-1");
userDeptRole.setRoleID("freedom");
userDeptRole.setCreateTime(new Date());
userDeptRole.setCreateTime(now);
userMapper.insert(user);
userInfoMapper.insert(userInfo);
userDeptRoleMapper.insert(userDeptRole);
userMapper.insertUser(user);
userInfoMapper.insertUserInfo(userInfo);
userDeptRoleMapper.bindUser(Arrays.asList(userDeptRole));
resultDomain.success("注册用户成功", user);
return resultDomain;
} catch (Exception e) {
logger.error("注册用户失败：{}", user.getUsername(), e);
@@ -100,11 +107,8 @@ public class SysUserServiceImpl implements SysUserService {
try {
logger.info("开始查询所有用户");
LambdaQueryWrapper<TbSysUser> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TbSysUser::getDeleted, false)
.orderByAsc(TbSysUser::getCreateTime);
List<TbSysUser> users = userMapper.selectList(queryWrapper);
TbSysUser filter = new TbSysUser();
List<TbSysUser> users = userMapper.selectByFilter(filter);
logger.info("查询所有用户完成，共找到{}个用户", users.size());
resultDomain.success("查询成功", users);
@@ -128,20 +132,20 @@ public class SysUserServiceImpl implements SysUserService {
return resultDomain;
}
LambdaQueryWrapper<TbSysUser> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TbSysUser::getID, userId)
.eq(TbSysUser::getDeleted, false);
TbSysUser filter = new TbSysUser();
filter.setID(userId);
filter.setDeleted(false);
TbSysUser user = userMapper.selectOne(queryWrapper);
List<TbSysUser> users = userMapper.selectByFilter(filter);
if (user == null) {
if (users.isEmpty()) {
logger.warn("未找到用户：{}", userId);
resultDomain.fail("未找到指定用户");
return resultDomain;
}
logger.info("根据ID查询用户完成：{}", userId);
resultDomain.success("查询成功", user);
resultDomain.success("查询成功", users.get(0));
return resultDomain;
} catch (Exception e) {
@@ -193,26 +197,26 @@ public class SysUserServiceImpl implements SysUserService {
}
// 检查至少有一个查询条件
boolean hasFilter = StringUtils.hasText(filter.getID()) ||
StringUtils.hasText(filter.getUsername()) ||
StringUtils.hasText(filter.getEmail()) ||
StringUtils.hasText(filter.getPhone());
// boolean hasFilter = StringUtils.hasText(filter.getID()) ||
// StringUtils.hasText(filter.getUsername()) ||
// StringUtils.hasText(filter.getEmail()) ||
// StringUtils.hasText(filter.getPhone());
if (!hasFilter) {
resultDomain.fail("至少需要提供一个查询条件");
return resultDomain;
}
// if (!hasFilter) {
// resultDomain.fail("至少需要提供一个查询条件");
// return resultDomain;
// }
TbSysUser user = userMapper.selectByFilter(filter);
List<TbSysUser> users = userMapper.selectByFilter(filter);
if (user == null) {
if (users.isEmpty()) {
logger.warn("未找到符合条件的用户：{}", filter);
resultDomain.fail("未找到指定用户");
return resultDomain;
}
logger.info("根据过滤条件查询用户完成：{}", filter);
resultDomain.success("查询成功", user);
resultDomain.success("查询成功", users);
return resultDomain;
} catch (Exception e) {
@@ -222,6 +226,7 @@ public class SysUserServiceImpl implements SysUserService {
}
}
@Transactional
@Override
public ResultDomain<TbSysUser> createUser(TbSysUser user) {
ResultDomain<TbSysUser> resultDomain = new ResultDomain<>();
@@ -267,15 +272,15 @@ public class SysUserServiceImpl implements SysUserService {
}
// 插入数据库
int result = userMapper.insert(user);
ResultDomain<TbSysUser> result = registerUser(user);
if (result > 0) {
if (result.isSuccess()) {
logger.info("创建用户成功：{}", user.getUsername());
resultDomain.success("创建用户成功", user);
resultDomain.success("创建用户成功", result.getData());
return resultDomain;
} else {
logger.warn("创建用户失败：{}", user.getUsername());
resultDomain.fail("创建用户失败");
resultDomain.fail("创建用户失败：" + result.getMessage());
}
return resultDomain;
@@ -337,7 +342,7 @@ public class SysUserServiceImpl implements SysUserService {
user.setUpdateTime(new Date());
// 更新数据库
int result = userMapper.updateById(user);
int result = userMapper.updateUser(user);
if (result > 0) {
logger.info("更新用户成功：{}", user.getID());
@@ -379,7 +384,7 @@ public class SysUserServiceImpl implements SysUserService {
user.setDeleted(true);
user.setDeleteTime(new Date());
int result = userMapper.updateById(user);
int result = userMapper.updateUser(user);
if (result > 0) {
logger.info("删除用户成功：{}", userId);
@@ -398,6 +403,74 @@ public class SysUserServiceImpl implements SysUserService {
}
}
@Override
public ResultDomain<TbSysUserDeptRole> getBindUserDeptRoleList(TbSysUserDeptRole filter) {
ResultDomain<TbSysUserDeptRole> resultDomain = new ResultDomain<>();
List<TbSysUserDeptRole> userDeptRoles = userDeptRoleMapper.selectByFilter(filter);
resultDomain.success("查询成功", userDeptRoles);
return resultDomain;
}
@Transactional
@Override
public ResultDomain<UserDeptRoleVO> bindUserDeptRole(UserDeptRoleVO userDeptRoleVO) {
ResultDomain<UserDeptRoleVO> resultDomain = new ResultDomain<>();
TbSysUser currentUser = LoginUtil.getCurrentUser();
try {
List<TbSysUserDeptRole> userDeptRoles = new ArrayList<>();
logger.info("开始绑定用户部门角色：{}", userDeptRoleVO.getID());
Date now = new Date();
for (TbSysUser user : userDeptRoleVO.getUsers()) {
for(TbSysUserDeptRole userDeptRole : userDeptRoleVO.getUserDeptRoles()) {
userDeptRole.setID(IDUtils.generateID());
userDeptRole.setUserID(user.getID());
userDeptRole.setCreateTime(now);
userDeptRole.setCreator(currentUser.getID());
userDeptRoles.add(userDeptRole);
}
}
userDeptRoleMapper.bindUser(userDeptRoles);
} catch (Exception e) {
logger.error("绑定用户部门角色异常：{}", userDeptRoleVO.getID(), e);
resultDomain.fail("绑定用户部门角色失败：" + e.getMessage());
return resultDomain;
}
return resultDomain;
}
@Transactional
@Override
public ResultDomain<UserDeptRoleVO> unbindUserDeptRole(UserDeptRoleVO userDeptRoleVO) {
ResultDomain<UserDeptRoleVO> resultDomain = new ResultDomain<>();
TbSysUser currentUser = LoginUtil.getCurrentUser();
try {
List<TbSysUserDeptRole> userDeptRoles = new ArrayList<>();
logger.info("开始解绑用户部门角色：{}", userDeptRoleVO.getID());
Date now = new Date();
for(TbSysUser user:userDeptRoleVO.getUsers()) {
for(TbSysUserDeptRole userDeptRole : userDeptRoleVO.getUserDeptRoles()) {
userDeptRole.setUserID(user.getID());
userDeptRoles.add(userDeptRole);
}
}
int result = userDeptRoleMapper.unbindUser(userDeptRoles);
if(result > 0) {
logger.info("解绑用户部门角色成功：{}", userDeptRoleVO.getID());
resultDomain.success("解绑用户部门角色成功", userDeptRoleVO);
} else {
logger.warn("解绑用户部门角色失败：{}", userDeptRoleVO.getID());
resultDomain.fail("解绑用户部门角色失败");
}
return resultDomain;
} catch (Exception e) {
logger.error("解绑用户部门角色异常：{}", userDeptRoleVO.getID(), e);
resultDomain.fail("解绑用户部门角色失败：" + e.getMessage());
}
return resultDomain;
}
@Override
public ResultDomain<Boolean> checkUsernameExists(String username, String excludeId) {
ResultDomain<Boolean> resultDomain = new ResultDomain<>();
@@ -408,16 +481,15 @@ public class SysUserServiceImpl implements SysUserService {
resultDomain.fail("用户名不能为空");
return resultDomain;
}
LambdaQueryWrapper<TbSysUser> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TbSysUser::getUsername, username)
.eq(TbSysUser::getDeleted, false);
TbSysUser filter = new TbSysUser();
if (StringUtils.hasText(excludeId)) {
queryWrapper.ne(TbSysUser::getID, excludeId);
filter.setID(excludeId);
}
filter.setUsername(username);
filter.setDeleted(false);
long count = userMapper.selectCount(queryWrapper);
long count = userMapper.selectByFilter(filter).size();
boolean exists = count > 0;
logger.info("用户名存在性检查完成：{}，存在：{}", username, exists);
@@ -442,15 +514,15 @@ public class SysUserServiceImpl implements SysUserService {
return resultDomain;
}
LambdaQueryWrapper<TbSysUser> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TbSysUser::getEmail, email)
.eq(TbSysUser::getDeleted, false);
TbSysUser filter = new TbSysUser();
filter.setEmail(email);
filter.setDeleted(false);
if (StringUtils.hasText(excludeId)) {
queryWrapper.ne(TbSysUser::getID, excludeId);
filter.setID(excludeId);
}
long count = userMapper.selectCount(queryWrapper);
long count = userMapper.selectByFilter(filter).size();
boolean exists = count > 0;
logger.info("邮箱存在性检查完成：{}，存在：{}", email, exists);
@@ -510,7 +582,7 @@ public class SysUserServiceImpl implements SysUserService {
user.setStatus(status);
user.setUpdateTime(new Date());
int result = userMapper.updateById(user);
int result = userMapper.updateUser(user);
if (result > 0) {
logger.info("修改用户状态成功：{}", userId);
@@ -557,7 +629,7 @@ public class SysUserServiceImpl implements SysUserService {
user.setPassword(newPassword);
user.setUpdateTime(new Date());
int result = userMapper.updateById(user);
int result = userMapper.updateUser(user);
if (result > 0) {
logger.info("重置用户密码成功：{}", userId);

18
schoolNewsServ/system/src/main/resources/mapper/DepartmentMapper.xml
View File

@@ -39,6 +39,16 @@
</where>
</sql>
<!-- selectDepts -->
<select id="selectDepts">
SELECT
<include refid="Base_Column_List"/>
FROM tb_sys_dept
<include refid="Where_Clause"/>
ORDER BY dept_id,create_time DESC
</select>
<!-- 根据父部门ID查询子部门列表 -->
<select id="selectByParentId" resultMap="BaseResultMap">
SELECT
@@ -46,7 +56,7 @@
FROM tb_sys_dept
WHERE deleted = 0
AND parent_id = #{parentId}
ORDER BY create_time DESC
ORDER BY dept_id,create_time DESC
</select>
<!-- 检查部门名称是否存在 -->
@@ -92,7 +102,7 @@
delete_time = NOW(),
updater = #{updater}
WHERE deleted = 0
AND id IN
AND dept_id IN
<foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
@@ -134,7 +144,7 @@
<if test="updater != null">updater = #{updater},</if>
update_time = NOW()
</set>
WHERE id = #{id} AND deleted = 0
WHERE dept_id = #{deptID} AND deleted = 0
</update>
<!-- 根据ID删除（逻辑删除） -->
@@ -142,7 +152,7 @@
UPDATE tb_sys_dept
SET deleted = 1,
delete_time = NOW()
WHERE id = #{id} AND deleted = 0
WHERE dept_id = #{deptID} AND deleted = 0
</update>
</mapper>

68
schoolNewsServ/system/src/main/resources/mapper/DeptRoleMapper.xml Normal file
View File

@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.xyzh.system.mapper.DeptRoleMapper">
<!-- 基础结果映射 -->
<resultMap id="BaseResultMap" type="org.xyzh.common.dto.dept.TbSysDeptRole">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="dept_id" property="deptID" jdbcType="VARCHAR"/>
<result column="role_id" property="roleID" jdbcType="VARCHAR"/>
<result column="creator" property="creator" jdbcType="VARCHAR"/>
<result column="updater" property="updater" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<result column="delete_time" property="deleteTime" jdbcType="TIMESTAMP"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
</resultMap>
<!-- 基础字段 -->
<sql id="Base_Column_List">
id, dept_id, role_id, creator, updater,
create_time, update_time, delete_time, deleted
</sql>
<sql id="Where_Clause">
<where>
deleted = 0
<if test="deptID != null and deptID != ''">
AND dept_id = #{deptID}
</if>
</where>
</sql>
<!-- selectDeptRole -->
<select id="selectDeptRole">
SELECT
<include refid="Base_Column_List"/>
FROM tb_sys_dept_role
<include refid="Where_Clause"/>
ORDER BY create_time DESC
</select>
<select id="selectDeptRoleList">
SELECT
<include refid="Base_Column_List"/>
FROM tb_sys_dept_role
ORDER BY dept_id, role_id, create_time DESC
</select>
<!-- batchBindDeptRole -->
<insert id="batchBindDeptRole">
INSERT INTO tb_sys_dept_role (id, dept_id, role_id, creator, create_time, deleted)
VALUES
<foreach collection="deptRoles" item="deptRole" separator=",">
(#{deptRole.id}, #{deptRole.deptID}, #{deptRole.roleID}, #{deptRole.creator}, #{deptRole.createTime}, 0)
</foreach>
</insert>
<!-- batchUnbindDeptRole -->
<delete id="batchUnbindDeptRole">
DELETE FROM tb_sys_dept_role
WHERE (dept_id, role_id) IN
<foreach collection="deptRoles" item="deptRole" open="(" separator="," close=")">
(#{deptRole.deptID}, #{deptRole.roleID})
</foreach>
</delete>
</mapper>

8
schoolNewsServ/system/src/main/resources/mapper/MenuPermissionMapper.xml
View File

@@ -33,13 +33,9 @@
<!-- 批量解绑菜单权限（真删除） -->
<delete id="batchUnbindMenuPermission">
DELETE FROM tb_sys_menu_permission
WHERE menu_id IN
WHERE (menu_id, permission_id) IN
<foreach collection="menuPermissions" item="menuPermission" open="(" separator="," close=")">
#{menuPermission.menuID}
</foreach>
AND permission_id IN
<foreach collection="menuPermissions" item="menuPermission" open="(" separator="," close=")">
#{menuPermission.permissionID}
(#{menuPermission.menuID}, #{menuPermission.permissionID})
</foreach>
AND deleted = 0
</delete>

91
schoolNewsServ/system/src/main/resources/mapper/RoleMapper.xml
View File

@@ -58,14 +58,11 @@
<sql id="Where_Clause">
<where>
deleted = 0
<if test="roleName != null and roleName != ''">
AND role_name LIKE CONCAT('%', #{roleName}, '%')
<if test="roleID != null and roleID != ''">
AND role_id = #{roleID}
</if>
<if test="roleCode != null and roleCode != ''">
AND role_code = #{roleCode}
</if>
<if test="status != null">
AND status = #{status}
<if test="name != null and name != ''">
AND name LIKE CONCAT('%', #{name}, '%')
</if>
</where>
</sql>
@@ -80,6 +77,36 @@
ORDER BY role_id, create_time ASC
</select>
<!-- 根据过滤条件查询角色列表 -->
<select id="selectRole" resultMap="tbSysRoleResultMap">
SELECT
<include refid="TbSysRole_Column_List"/>
FROM tb_sys_role
<include refid="Where_Clause"/>
ORDER BY role_id, create_time ASC
</select>
<!-- 插入角色 -->
<insert id="insertRole" parameterType="org.xyzh.common.dto.role.TbSysRole">
INSERT INTO tb_sys_role
(id, role_id, name, description, creator, create_time)
VALUES (#{id}, #{roleID}, #{name}, #{description}, #{creator}, #{createTime})
</insert>
<!-- 更新角色 -->
<update id="updateRole" parameterType="org.xyzh.common.dto.role.TbSysRole">
UPDATE tb_sys_role
(name, description, updater, update_time)
VALUES (#{name}, #{description}, #{updater}, #{updateTime})
WHERE role_id = #{roleID}
</update>
<!-- 删除角色 -->
<delete id="deleteRole" parameterType="org.xyzh.common.dto.role.TbSysRole">
DELETE FROM tb_sys_role
WHERE role_id = #{roleID}
</delete>
<!-- 根据用户ID查询角色列表 -->
<select id="selectDeptRolesByUserId" resultMap="deptRoleVOResultMap">
SELECT
@@ -107,7 +134,7 @@
SELECT COUNT(1)
FROM tb_sys_role
WHERE deleted = 0
AND role_name = #{roleName}
AND name = #{roleName}
<if test="excludeId != null and excludeId != ''">
AND id != #{excludeId}
</if>
@@ -137,55 +164,7 @@
</foreach>
</update>
<!-- 插入角色 -->
<insert id="insert" parameterType="org.xyzh.common.dto.role.TbSysRole">
INSERT INTO tb_sys_role
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="roleID != null">role_id,</if>
<if test="roleName != null">role_name,</if>
<if test="roleCode != null">role_code,</if>
<if test="description != null">description,</if>
<if test="status != null">status,</if>
<if test="creator != null">creator,</if>
<if test="createTime != null">create_time,</if>
deleted
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="roleID != null">#{roleID},</if>
<if test="roleName != null">#{roleName},</if>
<if test="roleCode != null">#{roleCode},</if>
<if test="description != null">#{description},</if>
<if test="status != null">#{status},</if>
<if test="creator != null">#{creator},</if>
<if test="createTime != null">#{createTime},</if>
0
</trim>
</insert>
<!-- 更新角色 -->
<update id="updateById" parameterType="org.xyzh.common.dto.role.TbSysRole">
UPDATE tb_sys_role
<set>
<if test="roleID != null">role_id = #{roleID},</if>
<if test="roleName != null">role_name = #{roleName},</if>
<if test="roleCode != null">role_code = #{roleCode},</if>
<if test="description != null">description = #{description},</if>
<if test="status != null">status = #{status},</if>
<if test="updater != null">updater = #{updater},</if>
update_time = NOW()
</set>
WHERE id = #{id} AND deleted = 0
</update>
<!-- 根据ID删除（逻辑删除） -->
<update id="deleteById">
UPDATE tb_sys_role
SET deleted = 1,
delete_time = NOW()
WHERE id = #{id} AND deleted = 0
</update>
<!-- checkRoleExists -->

56
schoolNewsServ/system/src/main/resources/mapper/RolePermissionMapper.xml
View File

@@ -14,6 +14,19 @@
<result column="delete_time" property="deleteTime" jdbcType="TIMESTAMP"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
</resultMap>
<resultMap id="PermissionResultMap" type="org.xyzh.common.dto.permission.TbSysPermission">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="permission_id" property="permissionID" jdbcType="VARCHAR"/>
<result column="name" property="name" jdbcType="VARCHAR"/>
<result column="code" property="code" jdbcType="VARCHAR"/>
<result column="description" property="description" jdbcType="VARCHAR"/>
<result column="creator" property="creator" jdbcType="VARCHAR"/>
<result column="updater" property="updater" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<result column="delete_time" property="deleteTime" jdbcType="TIMESTAMP"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
</resultMap>
<!-- 基础字段 -->
<sql id="Base_Column_List">
@@ -21,6 +34,11 @@
create_time, update_time, delete_time, deleted
</sql>
<!-- 权限基础字段 -->
<sql id="Permission_Column_List">
id, permission_id, name, code, description, creator, updater, create_time, update_time, delete_time, deleted
</sql>
<!-- 批量绑定角色权限 -->
<insert id="batchBindRolePermission">
INSERT INTO tb_sys_role_permission (id, role_id, permission_id, creator, create_time, deleted)
@@ -33,13 +51,9 @@
<!-- 批量解绑角色权限（真删除,避免批量绑定时报错存在的问题） -->
<delete id="batchUnbindRolePermission">
DELETE FROM tb_sys_role_permission
WHERE role_id IN
WHERE (role_id, permission_id) IN
<foreach collection="rolePermissions" item="rolePermission" open="(" separator="," close=")">
#{rolePermission.roleID}
</foreach>
AND permission_id IN
<foreach collection="rolePermissions" item="rolePermission" open="(" separator="," close=")">
#{rolePermission.permissionID}
(#{rolePermission.roleID}, #{rolePermission.permissionID})
</foreach>
AND deleted = 0
</delete>
@@ -50,19 +64,27 @@
<include refid="Base_Column_List"/>
FROM tb_sys_role_permission
WHERE deleted = 0
AND role_id = #{rolePermission.roleID}
AND permission_id = #{rolePermission.permissionID}
AND role_id = #{roleId}
AND permission_id = #{permissionId}
LIMIT 1
</select>
<!-- 根据角色ID查询权限关联列表 -->
<select id="selectByRoleId" resultMap="BaseResultMap">
<select id="selectByRoleId" resultMap="PermissionResultMap">
SELECT
<include refid="Base_Column_List"/>
FROM tb_sys_role_permission
WHERE deleted = 0
AND role_id = #{rolePermission.roleID}
ORDER BY create_time ASC
tsp.permission_id,
tsp.name,
tsp.code,
tsp.description,
tsp.creator,
tsp.updater,
tsp.create_time,
tsp.update_time
FROM tb_sys_role_permission tsrp
INNER JOIN tb_sys_permission tsp ON tsrp.permission_id = tsp.permission_id
WHERE tsrp.deleted = 0 AND tsp.deleted = 0
AND tsrp.role_id = #{roleId}
ORDER BY tsrp.permission_id , tsrp.create_time ASC
</select>
<!-- 根据权限ID查询角色关联列表 -->
@@ -71,7 +93,7 @@
<include refid="Base_Column_List"/>
FROM tb_sys_role_permission
WHERE deleted = 0
AND permission_id = #{rolePermission.permissionID}
AND permission_id = #{permissionId}
ORDER BY create_time ASC
</select>
@@ -82,8 +104,8 @@
delete_time = NOW(),
updater = #{updater}
WHERE deleted = 0
AND role_id = #{rolePermission.roleID}
AND permission_id = #{rolePermission.permissionID}
AND role_id = #{roleId}
AND permission_id = #{permissionId}
</update>
</mapper>

69
schoolNewsServ/system/src/main/resources/mapper/UserDeptRoleMapper.xml
View File

@@ -1,4 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.xyzh.system.mapper.UserDeptRoleMapper">
<resultMap id="UserDeptRoleResultMap" type="TbSysUserDeptRole">
<id column="id" property="id" />
<result column="user_id" property="userID" />
<result column="dept_id" property="deptID" />
<result column="role_id" property="roleID" />
<result column="creator" property="creator" />
<result column="updater" property="updater" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="delete_time" property="deleteTime" />
<result column="deleted" property="deleted" />
</resultMap>
<sql id="UserDeptRole_Column_List">
id, user_id, dept_id, role_id, creator, updater, create_time, update_time, delete_time, deleted
</sql>
<sql id="Where_Clause" >
<where>
<if test="id != null">
id = #{id}
</if>
<if test="userID != null">
user_id = #{userID}
</if>
<if test="deptID != null">
dept_id = #{deptID}
</if>
<if test="roleID != null">
role_id = #{roleID}
</if>
<if test="creator != null">
creator = #{creator}
</if>
<if test="updater != null">
updater = #{updater}
</if>
<if test="createTime != null">
create_time = #{createTime}
</if>
</where>
</sql>
<!-- selectByFilter -->
<select id="selectByFilter">
SELECT
<include refid="UserDeptRole_Column_List"/>
FROM tb_sys_user_dept_role
<include refid="Where_Clause"/>
ORDER BY user_id, dept_id, role_id, create_time DESC
</select>
<insert id="bindUser" parameterType="TbSysUserDeptRole">
INSERT INTO tb_sys_user_dept_role (id, user_id, dept_id, role_id, creator, create_time)
VALUES
<foreach collection="userDeptRoles" item="userDeptRole" separator=",">
(#{userDeptRole.id}, #{userDeptRole.userID}, #{userDeptRole.deptID}, #{userDeptRole.roleID}, #{userDeptRole.creator}, #{userDeptRole.createTime})
</foreach>
</insert>
<delete id="unbindUser" parameterType="TbSysUserDeptRole">
DELETE FROM tb_sys_user_dept_role
WHERE (user_id, dept_id, role_id) IN
<foreach collection="userDeptRoles" item="userDeptRole" open="(" separator="," close=")">
(#{userDeptRole.userID}, #{userDeptRole.deptID}, #{userDeptRole.roleID})
</foreach>
</delete>
</mapper>

47
schoolNewsServ/system/src/main/resources/mapper/UserInfoMapper.xml
View File

@@ -1,5 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.xyzh.system.mapper.UserInfoMapper">
<resultMap id="BaseResultMap" type="TbSysUserInfo">
<id column="id" property="id" />
<result column="user_id" property="userID" />
<result column="avatar" property="avatar" />
<result column="gender" property="gender" />
<result column="family_name" property="familyName" />
<result column="given_name" property="givenName" />
<result column="full_name" property="fullName" />
<result column="id_card" property="idCard" />
<result column="address" property="address" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="delete_time" property="deleteTime" />
<result column="deleted" property="deleted" />
</resultMap>
<sql id="Base_Column_List">
id, user_id, avatar, gender, family_name, given_name, full_name, id_card, address, create_time, update_time, delete_time, deleted
</sql>
<!-- insertUserInfo -->
<insert id="insertUserInfo">
INSERT INTO tb_sys_user_info (id, user_id, avatar, create_time)
VALUES (#{userInfo.id}, #{userInfo.userID}, #{userInfo.avatar}, #{userInfo.createTime})
</insert>
<!-- updateUserInfo -->
<update id="updateUserInfo">
UPDATE tb_sys_user_info
<set>
<if test="userInfo.avatar != null">avatar = #{userInfo.avatar},</if>
<if test="userInfo.gender != null">gender = #{userInfo.gender},</if>
<if test="userInfo.familyName != null">family_name = #{userInfo.familyName},</if>
<if test="userInfo.givenName != null">given_name = #{userInfo.givenName},</if>
<if test="userInfo.fullName != null">full_name = #{userInfo.fullName},</if>
<if test="userInfo.idCard != null">id_card = #{userInfo.idCard},</if>
<if test="userInfo.address != null">address = #{userInfo.address},</if>
<if test="userInfo.updater != null">updater = #{userInfo.updater},</if>
<if test="userInfo.updateTime != null">update_time = #{userInfo.updateTime},</if>
</set>
WHERE user_id = #{userInfo.userID}
</update>
<delete id="deleteUserInfo">
DELETE FROM tb_sys_user_info
WHERE user_id = #{userID}
</delete>
</mapper>

74
schoolNewsServ/system/src/main/resources/mapper/UserMapper.xml
View File

@@ -124,7 +124,6 @@
AND wechat_id = #{filter.wechatID}
</if>
</where>
LIMIT 1
</select>
<!-- 查询用户列表 -->
@@ -150,67 +149,50 @@
</update>
<!-- 插入用户 -->
<insert id="insert" parameterType="org.xyzh.common.dto.user.TbSysUser">
<insert id="insertUser" parameterType="org.xyzh.common.dto.user.TbSysUser">
INSERT INTO tb_sys_user
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="username != null">username,</if>
<if test="password != null">password,</if>
<if test="email != null">email,</if>
<if test="phone != null">phone,</if>
<if test="avatar != null">avatar,</if>
<if test="nickname != null">nickname,</if>
<if test="gender != null">gender,</if>
<if test="birthday != null">birthday,</if>
<if test="status != null">status,</if>
<if test="lastLoginTime != null">last_login_time,</if>
<if test="lastLoginIp != null">last_login_ip,</if>
<if test="creator != null">creator,</if>
<if test="createTime != null">create_time,</if>
<if test="user.id != null">id,</if>
<if test="user.username != null">username,</if>
<if test="user.password != null">password,</if>
<if test="user.email != null">email,</if>
<if test="user.phone != null">phone,</if>
<if test="user.wechatID != null">wechat_id,</if>
<if test="user.status != null">status,</if>
<if test="user.createTime != null">create_time,</if>
deleted
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="username != null">#{username},</if>
<if test="password != null">#{password},</if>
<if test="email != null">#{email},</if>
<if test="phone != null">#{phone},</if>
<if test="avatar != null">#{avatar},</if>
<if test="nickname != null">#{nickname},</if>
<if test="gender != null">#{gender},</if>
<if test="birthday != null">#{birthday},</if>
<if test="status != null">#{status},</if>
<if test="lastLoginTime != null">#{lastLoginTime},</if>
<if test="lastLoginIp != null">#{lastLoginIp},</if>
<if test="creator != null">#{creator},</if>
<if test="createTime != null">#{createTime},</if>
VALUES
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="user.id != null">#{user.id},</if>
<if test="user.username != null">#{user.username},</if>
<if test="user.password != null">#{user.password},</if>
<if test="user.email != null">#{user.email},</if>
<if test="user.phone != null">#{user.phone},</if>
<if test="user.wechatID != null">#{user.wechatID},</if>
<if test="user.status != null">#{user.status},</if>
<if test="user.createTime != null">#{user.createTime},</if>
0
</trim>
</insert>
<!-- 更新用户 -->
<update id="updateById" parameterType="org.xyzh.common.dto.user.TbSysUser">
<update id="updateUser" parameterType="org.xyzh.common.dto.user.TbSysUser">
UPDATE tb_sys_user
<set>
<if test="username != null">username = #{username},</if>
<if test="password != null">password = #{password},</if>
<if test="email != null">email = #{email},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="avatar != null">avatar = #{avatar},</if>
<if test="nickname != null">nickname = #{nickname},</if>
<if test="gender != null">gender = #{gender},</if>
<if test="birthday != null">birthday = #{birthday},</if>
<if test="status != null">status = #{status},</if>
<if test="lastLoginTime != null">last_login_time = #{lastLoginTime},</if>
<if test="lastLoginIp != null">last_login_ip = #{lastLoginIp},</if>
<if test="updater != null">updater = #{updater},</if>
<if test="user.username != null">username = #{user.username},</if>
<if test="user.password != null">password = #{user.password},</if>
<if test="user.email != null">email = #{user.email},</if>
<if test="user.phone != null">phone = #{user.phone},</if>
<if test="user.wechatID != null">wechat_id = #{user.wechatID},</if>
<if test="user.status != null">status = #{user.status},</if>
update_time = NOW()
</set>
WHERE id = #{id} AND deleted = 0
WHERE id = #{user.id} AND deleted = 0
</update>
<!-- 根据ID删除（逻辑删除） -->
<update id="deleteById">
<update id="deleteUser">
UPDATE tb_sys_user
SET deleted = 1,
delete_time = NOW()

132
schoolNewsWeb/src/apis/system/dept.ts Normal file
View File

@@ -0,0 +1,132 @@
/**
* @description 部门相关API
* @author yslg
* @since 2025-10-06
*/
import { api } from '@/apis/index';
import type { SysDept, SysRole, DeptRoleVO, SysDeptRole } from '@/types';
/**
* 部门API服务
*/
export const deptApi = {
/**
* @description 查询所有部门
* @returns Promise<SysDept[]> 部门列表
* @author yslg
* @ since 2025-10-06
*/
async getAllDepts(): Promise<SysDept[]> {
const response = await api.post<SysDept>('/depts/all');
return response.data.dataList!;
},
/**
* @description 查询部门列表
* @param filter 过滤条件
* @returns Promise<SysDept[]> 部门列表
* @author yslg
* @ since 2025-10-06
*/
async getDeptList(filter: SysDept): Promise<SysDept[]> {
const response = await api.post<SysDept>('/depts/list', filter);
return response.data.dataList!;
},
/**
* @description 查询部门
* @param dept 部门信息
* @returns Promise<SysDept> 部门信息
* @author yslg
* @ since 2025-10-06
*/
async getDeptById(dept: SysDept): Promise<SysDept> {
const response = await api.post<SysDept>('/depts/id', dept);
return response.data.data!;
},
/**
* @description 创建部门
* @param dept 部门信息
* @returns Promise<SysDept> 部门信息
* @author yslg
* @ since 2025-10-06
*/
async createDept(dept: SysDept): Promise<SysDept> {
const response = await api.post<SysDept>('/depts/dept', dept);
return response.data.data!;
},
/**
* @description 更新部门
* @param dept 部门信息
* @returns Promise<SysDept> 部门信息
* @author yslg
* @ since 2025-10-06
*/
async updateDept(dept: SysDept): Promise<SysDept> {
const response = await api.put<SysDept>('/depts/dept', dept);
return response.data.data!;
},
/**
* @description 删除部门
* @param dept 部门信息
* @returns Promise<SysDept> 部门信息
* @author yslg
* @ since 2025-10-06
*/
async deleteDept(dept: SysDept): Promise<SysDept> {
const response = await api.delete<SysDept>('/depts/dept', dept);
return response.data.data!;
},
/**
* @description 查询部门绑定角色
* @param dept 部门信息
* @returns Promise<SysRole[]> 角色列表
* @author yslg
* @ since 2025-10-06
*/
async getDeptByRole(dept: SysDept): Promise<SysRole[]> {
const response = await api.post<SysRole>('/depts/role', dept);
return response.data.dataList!;
},
/**
* @description 查询部门角色列表
* @param dept 部门角色信息
* @returns Promise<SysDeptRole[]> 部门角色列表
* @author yslg
* @ since 2025-10-06
*/
async getDeptRoleList(dept: SysDeptRole): Promise<SysDeptRole[]> {
const response = await api.post<SysDeptRole>('/depts/role/list', dept);
return response.data.dataList!;
},
/**
* @description 绑定部门角色
* @param deptRole 部门角色VO
* @returns Promise<SysDeptRole> 部门角色信息
* @author yslg
* @ since 2025-10-06
*/
async bindDeptRole(deptRole: DeptRoleVO): Promise<SysDeptRole> {
const response = await api.post<SysDeptRole>('/depts/bind/role', deptRole);
return response.data.data!;
},
/**
* @description 解绑部门角色
* @param deptRole 部门角色VO
* @returns Promise<SysDeptRole> 部门角色信息
* @author yslg
* @ since 2025-10-06
*/
async unbindDeptRole(deptRole: DeptRoleVO): Promise<SysDeptRole> {
const response = await api.post<SysDeptRole>('/depts/unbind/role', deptRole);
return response.data.data!;
}
};

102
schoolNewsWeb/src/apis/system/role.ts
View File

@@ -1,16 +1,96 @@
/**
* @description 角色相关API
* @author yslg
* @since 2025-10-09
*/
import { api } from '@/apis/index';
import type { SysRole } from '@/types';
import type { SysPermission, SysRole, SysRolePermission } from '@/types';
/**
* 菜单API服务
* 角色API服务
*/
export const roleApi = {
/**
* 获取所有角色列表
* @returns Promise<SysRole[]>
*/
async getRoleList(): Promise<SysRole[]> {
const response = await api.post<SysRole>('/roles/all');
return response.data.dataList!;
}
}
/**
* @description 获取所有角色
* @returns Promise<SysRole[]> 角色列表
* @author yslg
* @ since 2025-10-09
*/
async getAllRoles(): Promise<SysRole[]> {
const response = await api.post<SysRole>('/roles/all');
return response.data.dataList!;
},
/**
* @description 根据角色ID获取角色
* @param role 角色信息
* @returns Promise<SysRole> 角色信息
* @author yslg
* @ since 2025-10-09
*/
async getRoleById(role: SysRole): Promise<SysRole> {
const response = await api.post<SysRole>('/roles/id', role);
return response.data.data!;
},
/**
* @description 根据过滤条件获取角色列表
* @param filter 过滤条件
* @returns Promise<SysRole[]> 角色列表
* @author yslg
* @ since 2025-10-09
*/
async getRoleList(filter: SysRole): Promise<SysRole[]> {
const response = await api.post<SysRole>('/roles/list', filter);
return response.data.dataList!;
},
/**
* @description 创建角色
* @param role 角色信息
* @returns Promise<SysRole> 角色信息
* @author yslg
* @ since 2025-10-09
*/
async createRole(role: SysRole): Promise<SysRole> {
const response = await api.post<SysRole>('/roles/role', role);
return response.data.data!;
},
/**
* @description 更新角色
* @param role 角色信息
* @returns Promise<SysRole> 角色信息
* @author yslg
* @ since 2025-10-09
*/
async updateRole(role: SysRole): Promise<SysRole> {
const response = await api.put<SysRole>('/roles/role', role);
return response.data.data!;
},
/**
* @description 删除角色
* @param role 角色信息
* @returns Promise<SysRole> 角色信息
* @author yslg
* @ since 2025-10-09
*/
async deleteRole(role: SysRole): Promise<SysRole> {
const response = await api.delete<SysRole>('/roles/role', role);
return response.data.data!;
},
/**
* @description 获取角色绑定权限列表
* @param role 角色信息
* @returns Promise<SysRole> 角色信息
* @author yslg
* @ since 2025-10-09
*/
async getRolePermission(role: SysRole): Promise<SysPermission[]> {
const response = await api.post<SysPermission>('/roles/permission', role);
return response.data.dataList!;
}
};

93
schoolNewsWeb/src/apis/system/user.ts
View File

@@ -5,7 +5,7 @@
*/
import { api } from '@/apis/index';
import type { SysUser, SysUserInfo, UserVO, PageDomain, PageParam } from '@/types';
import type { SysUser, SysUserInfo, UserVO, UserDeptRoleVO, SysUserDeptRole } from '@/types';
/**
* 用户API服务
@@ -16,7 +16,7 @@ export const userApi = {
* @returns Promise<UserVO>
*/
async getCurrentUser(): Promise<UserVO> {
const response = await api.get<UserVO>('/user/current');
const response = await api.get<UserVO>('/users/current');
return response.data.data!;
},
@@ -26,7 +26,7 @@ export const userApi = {
* @returns Promise<boolean>
*/
async updateCurrentUser(user: SysUser): Promise<boolean> {
const response = await api.put<boolean>('/user/current', user);
const response = await api.put<boolean>('/users/current', user);
return response.data.data!;
},
@@ -36,7 +36,7 @@ export const userApi = {
* @returns Promise<boolean>
*/
async updateUserInfo(userInfo: SysUserInfo): Promise<boolean> {
const response = await api.put<boolean>('/user/info', userInfo);
const response = await api.put<boolean>('/users/info', userInfo);
return response.data.data!;
},
@@ -47,7 +47,7 @@ export const userApi = {
* @returns Promise<boolean>
*/
async changePassword(oldPassword: string, newPassword: string): Promise<boolean> {
const response = await api.post<boolean>('/user/change-password', {
const response = await api.post<boolean>('/users/change-password', {
oldPassword,
newPassword
});
@@ -55,55 +55,72 @@ export const userApi = {
},
/**
* 获取用户列表（分页）
* @param pageParam 分页参数
* @returns Promise<PageDomain<SysUser>>
* 获取用户列表
* @param filter 过滤条件
* @returns Promise<SysUser[]>
*/
async getUserList(pageParam: PageParam): Promise<PageDomain<SysUser>> {
const response = await api.get<SysUser>('/user/list', {
params: pageParam
});
return response.data.pageDomain!;
},
/**
* 根据ID获取用户
* @param userId 用户ID
* @returns Promise<SysUser>
*/
async getUserById(userId: string): Promise<SysUser> {
const response = await api.get<SysUser>(`/user/${userId}`);
return response.data.data!;
async getUserList(filter: SysUser): Promise<SysUser[]> {
const response = await api.post<SysUser>('/users/list', filter);
return response.data.dataList!;
},
/**
* 创建用户
* @param user 用户信息
* @returns Promise<string> 返回用户ID
* @returns Promise<SysUser>
*/
async createUser(user: SysUser): Promise<string> {
const response = await api.post<string>('/user', user);
async createUser(user: SysUser): Promise<SysUser> {
const response = await api.post<SysUser>('/users/user', user);
return response.data.data!;
},
/**
* 更新用户
* @param userId 用户ID
* @param user 用户信息
* @returns Promise<boolean>
* @returns Promise<SysUser>
*/
async updateUser(userId: string, user: SysUser): Promise<boolean> {
const response = await api.put<boolean>(`/user/${userId}`, user);
async updateUser(user: SysUser): Promise<SysUser> {
const response = await api.put<SysUser>('/users/user', user);
return response.data.data!;
},
/**
* 删除用户
* @param userId 用户ID
* @returns Promise<boolean>
* @param user 用户信息
* @returns Promise<SysUser>
*/
async deleteUser(userId: string): Promise<boolean> {
const response = await api.delete<boolean>(`/user/${userId}`);
async deleteUser(user: SysUser): Promise<SysUser> {
const response = await api.delete<SysUser>('/users/user', user);
return response.data.data!;
},
/**
* 获取用户部门角色绑定信息
* @param user 用户信息
* @returns Promise<UserDeptRoleVO>
*/
async getUserDeptRole(user: SysUserDeptRole): Promise<SysUserDeptRole[]> {
const response = await api.post<SysUserDeptRole>('/users/bind/deptrole/list', user);
return response.data.dataList!;
},
/**
* 绑定用户部门角色
* @param userDeptRoleVO 用户部门角色绑定信息
* @returns Promise<UserDeptRoleVO>
*/
async bindUserDeptRole(userDeptRoleVO: UserDeptRoleVO): Promise<UserDeptRoleVO> {
const response = await api.post<UserDeptRoleVO>('/users/bind/deptrole', userDeptRoleVO);
return response.data.data!;
},
/**
* 解绑用户部门角色
* @param userDeptRoleVO 用户部门角色解绑信息
* @returns Promise<UserDeptRoleVO>
*/
async unbindUserDeptRole(userDeptRoleVO: UserDeptRoleVO): Promise<UserDeptRoleVO> {
const response = await api.post<UserDeptRoleVO>('/users/unbind/deptrole', userDeptRoleVO);
return response.data.data!;
},
@@ -113,7 +130,7 @@ export const userApi = {
* @returns Promise<boolean>
*/
async batchDeleteUsers(userIds: string[]): Promise<boolean> {
const response = await api.post<boolean>('/user/batch-delete', { userIds });
const response = await api.post<boolean>('/users/batch-delete', { userIds });
return response.data.data!;
},
@@ -124,7 +141,7 @@ export const userApi = {
* @returns Promise<boolean>
*/
async changeUserStatus(userId: string, status: number): Promise<boolean> {
const response = await api.patch<boolean>(`/user/${userId}/status`, { status });
const response = await api.patch<boolean>(`/users/${userId}/status`, { status });
return response.data.data!;
},
@@ -134,7 +151,7 @@ export const userApi = {
* @returns Promise<string> 返回新密码
*/
async resetPassword(userId: string): Promise<string> {
const response = await api.post<string>(`/user/${userId}/reset-password`);
const response = await api.post<string>(`/users/${userId}/reset-password`);
return response.data.data!;
},
@@ -146,7 +163,7 @@ export const userApi = {
async uploadAvatar(file: File): Promise<string> {
const formData = new FormData();
formData.append('file', file);
const response = await api.upload<string>('/user/avatar', formData);
const response = await api.upload<string>('/users/avatar', formData);
return response.data.data!;
}
};

5
schoolNewsWeb/src/types/dept/index.ts
View File

@@ -23,6 +23,8 @@ export interface SysDept extends BaseDTO {
creator?: string;
/** 更新人 */
updater?: string;
/** 子部门列表（前端使用） */
children?: SysDept[];
}
/**
@@ -33,12 +35,15 @@ export interface DeptRoleVO {
dept?: SysDept;
/** 角色信息 */
role?: SysRole;
depts?: SysDept[];
roles?: SysRole[];
}
/**
* 部门角色关联
*/
export interface SysDeptRole extends BaseDTO {
id?: string;
/** 部门ID */
deptID?: string;
/** 角色ID */

15
schoolNewsWeb/src/types/user/index.ts
View File

@@ -5,7 +5,8 @@
*/
import { BaseDTO } from '../base';
import { SysDept } from '../dept';
import { SysRole } from '../role';
/**
* 系统用户
*/
@@ -88,3 +89,15 @@ export interface SysUserDeptRole extends BaseDTO {
roleID?: string;
}
export interface UserDeptRoleVO extends BaseDTO {
/** 单个用户信息 */
user?: SysUser;
/** 用户列表 */
users?: SysUser[];
/** 部门列表 */
depts?: SysDept[];
/** 角色列表 */
roles?: SysRole[];
/** 用户部门角色关联列表 */
userDeptRoles?: SysUserDeptRole[];
}

563
schoolNewsWeb/src/views/manage/system/DeptManageView.vue
View File

@@ -1,13 +1,572 @@
<template>
<div>
部门管理
<div class="dept-manage">
<div class="header">
<h2>部门管理</h2>
<el-button type="primary" @click="handleAdd">
<el-icon><Plus /></el-icon>
新增部门
</el-button>
</div>
<el-table
:data="deptList"
style="width: 100%"
v-loading="loading"
border
stripe
row-key="deptID"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table-column prop="name" label="部门名称" min-width="200" />
<el-table-column prop="deptID" label="部门ID" min-width="150" />
<el-table-column prop="description" label="部门描述" min-width="200" show-overflow-tooltip />
<el-table-column prop="creatorName" label="创建人" width="120" />
<el-table-column prop="createTime" label="创建时间" width="180" />
<el-table-column label="操作" width="280" fixed="right">
<template #default="{ row }">
<el-button
type="primary"
size="small"
@click="handleAddChild(row)"
link
>
新增子部门
</el-button>
<el-button
type="primary"
size="small"
@click="handleEdit(row)"
link
>
编辑
</el-button>
<el-button
type="primary"
size="small"
@click="handleBindRole(row)"
link
>
绑定角色
</el-button>
<el-button
type="danger"
size="small"
@click="handleDelete(row)"
link
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 新增/编辑对话框 -->
<el-dialog
v-model="dialogVisible"
:title="isEdit ? '编辑部门' : '新增部门'"
width="600px"
@close="resetForm"
>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
>
<el-form-item label="父部门" prop="parentID">
<el-cascader
v-model="formData.parentID"
:options="parentDeptOptions"
:props="cascaderProps"
placeholder="请选择父部门"
clearable
style="width: 100%"
/>
</el-form-item>
<el-form-item label="部门名称" prop="name">
<el-input
v-model="formData.name"
placeholder="请输入部门名称"
clearable
/>
</el-form-item>
<el-form-item label="部门描述" prop="description">
<el-input
v-model="formData.description"
type="textarea"
:rows="3"
placeholder="请输入部门描述"
/>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button
type="primary"
@click="handleSubmit"
:loading="submitting"
>
确定
</el-button>
</template>
</el-dialog>
<!-- 绑定角色对话框 -->
<el-dialog v-model="bindRoleDialogVisible" title="绑定角色" width="800px" @close="resetBindList">
<div class="role-binding-container">
<!-- 部门信息显示 -->
<div class="dept-info" v-if="currentDept">
<h4>部门信息：{{ currentDept.name }}</h4>
<p>部门ID：{{ currentDept.deptID }}</p>
</div>
<!-- 角色绑定状态表格 -->
<el-table :data="roleList" style="width: 100%" border stripe>
<el-table-column width="80" label="绑定状态">
<template #default="{ row }">
<el-tag
:type="isRoleSelected(row.roleID) ? 'success' : 'info'"
size="small"
>
{{ isRoleSelected(row.roleID) ? '已绑定' : '未绑定' }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="name" label="角色名称" min-width="150" />
<el-table-column prop="roleID" label="角色ID" min-width="120" />
<el-table-column prop="description" label="角色描述" min-width="200" show-overflow-tooltip />
<el-table-column label="操作" width="100">
<template #default="{ row }">
<el-button
:type="isRoleSelected(row.roleID) ? 'danger' : 'primary'"
size="small"
@click="toggleRoleSelection(row)"
>
{{ isRoleSelected(row.roleID) ? '解绑' : '绑定' }}
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 统计信息 -->
<div class="binding-stats">
<el-alert
:title="`已绑定 ${selectedRoles.length} 个角色，未绑定 ${roleList.length - selectedRoles.length} 个角色`"
type="info"
:closable="false"
show-icon
/>
</div>
</div>
<template #footer>
<el-button @click="bindRoleDialogVisible = false">取消</el-button>
<el-button type="primary" @click="saveRoleBinding" :loading="submitting">
保存
</el-button>
</template>
</el-dialog>
</div>
</template>
<script setup lang="ts">
import { deptApi } from '@/apis/system/dept';
import { roleApi } from '@/apis/system/role';
import { SysDept, SysRole } from '@/types';
import { ref, onMounted, reactive, computed } from 'vue';
import { ElMessage, ElMessageBox, FormInstance, FormRules } from 'element-plus';
import { Plus } from '@element-plus/icons-vue';
// 数据状态
const deptList = ref<SysDept[]>([]);
const loading = ref(false);
const submitting = ref(false);
// 角色绑定相关数据
const roleList = ref<SysRole[]>([]);
const selectedRoles = ref<string[]>([]);
const currentDept = ref<SysDept | null>(null);
const bindList = ref<{ roles: SysRole[] }>({
roles: []
});
// 对话框状态
const dialogVisible = ref(false);
const isEdit = ref(false);
const formRef = ref<FormInstance>();
const bindRoleDialogVisible = ref(false);
// 表单数据
const formData = reactive<SysDept>({
name: '',
description: '',
parentID: undefined
});
// 表单验证规则
const formRules: FormRules = {
name: [
{ required: true, message: '请输入部门名称', trigger: 'blur' },
{ min: 2, max: 50, message: '部门名称长度在 2 到 50 个字符', trigger: 'blur' }
],
description: [
{ max: 200, message: '部门描述不能超过 200 个字符', trigger: 'blur' }
]
};
// 级联选择器配置
const cascaderProps = {
value: 'deptID',
label: 'name',
children: 'children',
checkStrictly: true
};
// 父部门选项
const parentDeptOptions = computed(() => {
return buildParentDeptOptions(deptList.value);
});
// 构建父部门选项
function buildParentDeptOptions(depts: SysDept[]): any[] {
return depts.map(dept => ({
deptID: dept.deptID,
name: dept.name,
children: dept.children ? buildParentDeptOptions(dept.children) : undefined
}));
}
// 加载部门列表
async function loadDeptList() {
try {
loading.value = true;
deptList.value = await deptApi.getAllDepts();
} catch (error) {
console.error('加载部门列表失败:', error);
ElMessage.error('加载部门列表失败');
} finally {
loading.value = false;
}
}
// 新增部门
function handleAdd() {
isEdit.value = false;
formData.parentID = undefined;
dialogVisible.value = true;
}
// 新增子部门
function handleAddChild(row: SysDept) {
isEdit.value = false;
formData.parentID = row.deptID;
dialogVisible.value = true;
}
// 编辑部门
function handleEdit(row: SysDept) {
isEdit.value = true;
Object.assign(formData, row);
dialogVisible.value = true;
}
// 删除部门
async function handleDelete(row: SysDept) {
try {
await ElMessageBox.confirm(
`确定要删除部门 "${row.name}" 吗？`,
'删除确认',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
);
await deptApi.deleteDept(row);
ElMessage.success('删除成功');
await loadDeptList();
} catch (error) {
if (error !== 'cancel') {
console.error('删除部门失败:', error);
ElMessage.error('删除部门失败');
}
}
}
// 提交表单
async function handleSubmit() {
if (!formRef.value) return;
try {
await formRef.value.validate();
submitting.value = true;
if (isEdit.value) {
await deptApi.updateDept(formData);
ElMessage.success('更新成功');
} else {
await deptApi.createDept(formData);
ElMessage.success('新增成功');
}
dialogVisible.value = false;
await loadDeptList();
} catch (error) {
if (error !== false) { // 表单验证失败时error为false
console.error('提交失败:', error);
ElMessage.error(isEdit.value ? '更新失败' : '新增失败');
}
} finally {
submitting.value = false;
}
}
// 重置表单
function resetForm() {
if (formRef.value) {
formRef.value.resetFields();
}
Object.assign(formData, {
name: '',
description: '',
parentID: undefined
});
}
// 查看绑定角色
async function handleBindRole(row: SysDept) {
currentDept.value = row;
try {
// 获取所有角色
roleList.value = await roleApi.getAllRoles();
// 获取已绑定的角色
const bindingResult = await deptApi.getDeptByRole(row);
bindList.value.roles = bindingResult || [];
// 设置已选中的角色
selectedRoles.value = bindList.value.roles.map(role => role.roleID).filter((id): id is string => !!id);
console.log('已绑定的角色:', bindList.value.roles);
console.log('所有角色:', roleList.value);
bindRoleDialogVisible.value = true;
} catch (error) {
console.error('获取角色绑定信息失败:', error);
ElMessage.error('获取角色绑定信息失败');
}
}
// 重置绑定列表
function resetBindList() {
bindList.value = {
roles: []
};
selectedRoles.value = [];
currentDept.value = null;
}
// 检查角色是否已选中
function isRoleSelected(roleID: string | undefined): boolean {
return roleID ? selectedRoles.value.includes(roleID) : false;
}
// 切换角色选择状态
function toggleRoleSelection(role: SysRole) {
if (!role.roleID) return;
const index = selectedRoles.value.indexOf(role.roleID);
if (index > -1) {
selectedRoles.value.splice(index, 1);
} else {
selectedRoles.value.push(role.roleID);
}
}
// 保存角色绑定
async function saveRoleBinding() {
if (!currentDept.value || !currentDept.value.deptID) {
ElMessage.error('部门信息不完整');
return;
}
try {
submitting.value = true;
// 获取当前已绑定的角色ID
const currentBoundRoles = (bindList.value.roles || []).map(role => role.roleID).filter((id): id is string => !!id);
// 找出需要绑定的角色（新增的）
const rolesToBind = selectedRoles.value.filter(roleID => !currentBoundRoles.includes(roleID));
// 找出需要解绑的角色（移除的）
const rolesToUnbind = currentBoundRoles.filter(roleID => !selectedRoles.value.includes(roleID));
// 构建需要绑定的角色对象数组
if (rolesToBind.length > 0) {
const rolesToBindObjects = rolesToBind.map(roleID => {
const role = roleList.value.find(r => r.roleID === roleID);
return role || { roleID: roleID };
});
const bindDept = {
dept: currentDept.value,
depts: [{deptID: currentDept.value.deptID}],
roles: rolesToBindObjects,
};
await deptApi.bindDeptRole(bindDept);
}
// 构建需要解绑的角色对象数组
if (rolesToUnbind.length > 0) {
const rolesToUnbindObjects = rolesToUnbind.map(roleID => {
const role = roleList.value.find(r => r.roleID === roleID);
return role || { roleID: roleID };
});
const unbindDept = {
dept: currentDept.value,
roles: rolesToUnbindObjects,
depts: [{deptID: currentDept.value.deptID}]
};
await deptApi.unbindDeptRole(unbindDept);
}
ElMessage.success('角色绑定保存成功');
bindRoleDialogVisible.value = false;
// 刷新部门列表
await loadDeptList();
} catch (error) {
console.error('保存角色绑定失败:', error);
ElMessage.error('保存角色绑定失败');
} finally {
submitting.value = false;
}
}
// 页面加载时获取部门列表
onMounted(() => {
loadDeptList();
});
</script>
<style scoped lang="scss">
.dept-manage {
padding: 20px;
.header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 20px;
h2 {
margin: 0;
color: #303133;
font-size: 20px;
font-weight: 600;
}
}
.el-table {
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
border-radius: 4px;
}
}
// 对话框样式优化
:deep(.el-dialog) {
.el-dialog__header {
padding: 20px 20px 10px;
border-bottom: 1px solid #ebeef5;
.el-dialog__title {
font-size: 16px;
font-weight: 600;
color: #303133;
}
}
.el-dialog__body {
padding: 20px;
}
.el-dialog__footer {
padding: 10px 20px 20px;
border-top: 1px solid #ebeef5;
}
}
// 表单样式优化
:deep(.el-form) {
.el-form-item__label {
font-weight: 500;
color: #606266;
}
.el-input__wrapper {
box-shadow: 0 0 0 1px #dcdfe6 inset;
&:hover {
box-shadow: 0 0 0 1px #c0c4cc inset;
}
&.is-focus {
box-shadow: 0 0 0 1px #409eff inset;
}
}
.el-textarea__inner {
box-shadow: 0 0 0 1px #dcdfe6 inset;
&:hover {
box-shadow: 0 0 0 1px #c0c4cc inset;
}
&:focus {
box-shadow: 0 0 0 1px #409eff inset;
}
}
}
// 按钮样式优化
:deep(.el-button) {
&.is-link {
padding: 0;
margin-right: 12px;
&:last-child {
margin-right: 0;
}
}
}
// 角色绑定容器样式
.role-binding-container {
.dept-info {
background: #f5f7fa;
padding: 15px;
border-radius: 4px;
margin-bottom: 20px;
h4 {
margin: 0 0 8px 0;
color: #303133;
font-size: 16px;
}
p {
margin: 0;
color: #606266;
font-size: 14px;
}
}
.binding-stats {
margin-top: 20px;
}
}
</style>

2
schoolNewsWeb/src/views/manage/system/PermissionManageView.vue
View File

@@ -346,7 +346,7 @@ async function handleBindRole(row: SysPermission) {
bindList.value.roles = bindingResult.roles || [];
// 获取所有角色
roleList.value = await roleApi.getRoleList();
roleList.value = await roleApi.getAllRoles();
// 设置已选中的角色
selectedRoles.value = bindList.value.roles.map(role => role.id).filter((id): id is string => !!id);

521
schoolNewsWeb/src/views/manage/system/RoleManageView.vue
View File

@@ -1,13 +1,530 @@
<template>
<div>
角色管理
<div class="role-manage">
<div class="header">
<h2>角色管理</h2>
<el-button type="primary" @click="handleAdd">
<el-icon><Plus /></el-icon>
新增角色
</el-button>
</div>
<el-table
:data="roleList"
style="width: 100%"
v-loading="loading"
border
stripe
>
<el-table-column prop="name" label="角色名称" min-width="200" />
<el-table-column prop="roleID" label="角色ID" min-width="150" />
<el-table-column prop="description" label="角色描述" min-width="200" show-overflow-tooltip />
<el-table-column prop="creatorName" label="创建人" width="120" />
<el-table-column prop="createTime" label="创建时间" width="180" />
<el-table-column label="操作" width="280" fixed="right">
<template #default="{ row }">
<el-button
type="primary"
size="small"
@click="handleEdit(row)"
link
>
编辑
</el-button>
<el-button
type="primary"
size="small"
@click="handleBindPermission(row)"
link
>
绑定权限
</el-button>
<el-button
type="danger"
size="small"
@click="handleDelete(row)"
link
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 新增/编辑对话框 -->
<el-dialog
v-model="dialogVisible"
:title="isEdit ? '编辑角色' : '新增角色'"
width="600px"
@close="resetForm"
>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
>
<el-form-item label="角色名称" prop="name">
<el-input
v-model="formData.name"
placeholder="请输入角色名称"
clearable
/>
</el-form-item>
<el-form-item label="角色描述" prop="description">
<el-input
v-model="formData.description"
type="textarea"
:rows="3"
placeholder="请输入角色描述"
/>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button
type="primary"
@click="handleSubmit"
:loading="submitting"
>
确定
</el-button>
</template>
</el-dialog>
<!-- 绑定权限对话框 -->
<el-dialog v-model="bindPermissionDialogVisible" title="绑定权限" width="800px" @close="resetBindList">
<div class="permission-binding-container">
<!-- 角色信息显示 -->
<div class="role-info" v-if="currentRole">
<h4>角色信息：{{ currentRole.name }}</h4>
<p>角色ID：{{ currentRole.roleID }}</p>
</div>
<!-- 权限绑定状态表格 -->
<el-table :data="permissionList" style="width: 100%" border stripe>
<el-table-column width="80" label="绑定状态">
<template #default="{ row }">
<el-tag
:type="isPermissionSelected(row.permissionID) ? 'success' : 'info'"
size="small"
>
{{ isPermissionSelected(row.permissionID) ? '已绑定' : '未绑定' }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="name" label="权限名称" min-width="150" />
<el-table-column prop="permissionID" label="权限ID" min-width="120" />
<el-table-column prop="code" label="权限编码" min-width="150" />
<el-table-column prop="description" label="权限描述" min-width="200" show-overflow-tooltip />
<el-table-column label="操作" width="100">
<template #default="{ row }">
<el-button
:type="isPermissionSelected(row.permissionID) ? 'danger' : 'primary'"
size="small"
@click="togglePermissionSelection(row)"
>
{{ isPermissionSelected(row.permissionID) ? '解绑' : '绑定' }}
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 统计信息 -->
<div class="binding-stats">
<el-alert
:title="`已绑定 ${selectedPermissions.length} 个权限，未绑定 ${permissionList.length - selectedPermissions.length} 个权限`"
type="info"
:closable="false"
show-icon
/>
</div>
</div>
<template #footer>
<el-button @click="bindPermissionDialogVisible = false">取消</el-button>
<el-button type="primary" @click="savePermissionBinding" :loading="submitting">
保存
</el-button>
</template>
</el-dialog>
</div>
</template>
<script setup lang="ts">
import { roleApi } from '@/apis/system/role';
import { permissionApi } from '@/apis/system/permission';
import { SysRole, SysPermission } from '@/types';
import { ref, onMounted, reactive } from 'vue';
import { ElMessage, ElMessageBox, FormInstance, FormRules } from 'element-plus';
import { Plus } from '@element-plus/icons-vue';
// 数据状态
const roleList = ref<SysRole[]>([]);
const loading = ref(false);
const submitting = ref(false);
// 权限绑定相关数据
const permissionList = ref<SysPermission[]>([]);
const selectedPermissions = ref<string[]>([]);
const currentRole = ref<SysRole | null>(null);
const bindList = ref<{ permissions: SysPermission[] }>({
permissions: []
});
// 对话框状态
const dialogVisible = ref(false);
const isEdit = ref(false);
const formRef = ref<FormInstance>();
const bindPermissionDialogVisible = ref(false);
// 表单数据
const formData = reactive<SysRole>({
name: '',
description: ''
});
// 表单验证规则
const formRules: FormRules = {
name: [
{ required: true, message: '请输入角色名称', trigger: 'blur' },
{ min: 2, max: 50, message: '角色名称长度在 2 到 50 个字符', trigger: 'blur' }
],
description: [
{ max: 200, message: '角色描述不能超过 200 个字符', trigger: 'blur' }
]
};
// 加载角色列表
async function loadRoleList() {
try {
loading.value = true;
roleList.value = await roleApi.getAllRoles();
} catch (error) {
console.error('加载角色列表失败:', error);
ElMessage.error('加载角色列表失败');
} finally {
loading.value = false;
}
}
// 新增角色
function handleAdd() {
isEdit.value = false;
dialogVisible.value = true;
}
// 编辑角色
function handleEdit(row: SysRole) {
isEdit.value = true;
Object.assign(formData, row);
dialogVisible.value = true;
}
// 删除角色
async function handleDelete(row: SysRole) {
try {
await ElMessageBox.confirm(
`确定要删除角色 "${row.name}" 吗？`,
'删除确认',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
);
await roleApi.deleteRole(row);
ElMessage.success('删除成功');
await loadRoleList();
} catch (error) {
if (error !== 'cancel') {
console.error('删除角色失败:', error);
ElMessage.error('删除角色失败');
}
}
}
// 提交表单
async function handleSubmit() {
if (!formRef.value) return;
try {
await formRef.value.validate();
submitting.value = true;
if (isEdit.value) {
await roleApi.updateRole(formData);
ElMessage.success('更新成功');
} else {
await roleApi.createRole(formData);
ElMessage.success('新增成功');
}
dialogVisible.value = false;
await loadRoleList();
} catch (error) {
if (error !== false) { // 表单验证失败时error为false
console.error('提交失败:', error);
ElMessage.error(isEdit.value ? '更新失败' : '新增失败');
}
} finally {
submitting.value = false;
}
}
// 重置表单
function resetForm() {
if (formRef.value) {
formRef.value.resetFields();
}
Object.assign(formData, {
name: '',
description: ''
});
}
// 查看绑定权限
async function handleBindPermission(row: SysRole) {
currentRole.value = row;
try {
// 获取所有权限
let permission: SysPermission = {
permissionID: undefined,
name: undefined,
code: undefined,
description: undefined,
};
permissionList.value = await permissionApi.getPermissionList(permission);
// 获取已绑定的权限
const bindingResult = await roleApi.getRolePermission({
roleID: row.roleID
});
console.log('已绑定的权限:', bindingResult);
bindList.value.permissions = bindingResult || [];
// 设置已选中的权限
selectedPermissions.value = bindList.value.permissions.map(permission => permission.permissionID).filter((id): id is string => !!id);
console.log('已绑定的权限:', bindList.value.permissions);
console.log('所有权限:', permissionList.value);
bindPermissionDialogVisible.value = true;
} catch (error) {
console.error('获取权限绑定信息失败:', error);
ElMessage.error('获取权限绑定信息失败');
}
}
// 重置绑定列表
function resetBindList() {
bindList.value = {
permissions: []
};
selectedPermissions.value = [];
currentRole.value = null;
}
// 检查权限是否已选中
function isPermissionSelected(permissionID: string | undefined): boolean {
return permissionID ? selectedPermissions.value.includes(permissionID) : false;
}
// 切换权限选择状态
function togglePermissionSelection(permission: SysPermission) {
if (!permission.permissionID) return;
const index = selectedPermissions.value.indexOf(permission.permissionID);
if (index > -1) {
selectedPermissions.value.splice(index, 1);
} else {
selectedPermissions.value.push(permission.permissionID);
}
}
// 保存权限绑定
async function savePermissionBinding() {
if (!currentRole.value || !currentRole.value.roleID) {
ElMessage.error('角色信息不完整');
return;
}
try {
submitting.value = true;
// 获取当前已绑定的权限ID
const currentBoundPermissions = (bindList.value.permissions || []).map(permission => permission.permissionID).filter((id): id is string => !!id);
// 找出需要绑定的权限（新增的）
const permissionsToBind = selectedPermissions.value.filter(permissionID => !currentBoundPermissions.includes(permissionID));
// 找出需要解绑的权限（移除的）
const permissionsToUnbind = currentBoundPermissions.filter(permissionID => !selectedPermissions.value.includes(permissionID));
// 构建需要绑定的权限对象数组
if (permissionsToBind.length > 0) {
const permissionsToBindObjects = permissionsToBind.map(permissionID => {
const permission = permissionList.value.find(p => p.permissionID === permissionID);
return permission || { permissionID: permissionID };
});
const bindRole = {
...currentRole.value,
permissions: permissionsToBindObjects,
roles: [{ roleID: currentRole.value.roleID }]
};
await permissionApi.bindRole(bindRole);
}
// 构建需要解绑的权限对象数组
if (permissionsToUnbind.length > 0) {
const permissionsToUnbindObjects = permissionsToUnbind.map(permissionID => {
const permission = permissionList.value.find(p => p.permissionID === permissionID);
return permission || { permissionID: permissionID };
});
const unbindRole = {
...currentRole.value,
permissions: permissionsToUnbindObjects,
roles: [{ roleID: currentRole.value.roleID }]
};
await permissionApi.unbindRole(unbindRole);
}
ElMessage.success('权限绑定保存成功');
bindPermissionDialogVisible.value = false;
// 刷新角色列表
await loadRoleList();
} catch (error) {
console.error('保存权限绑定失败:', error);
ElMessage.error('保存权限绑定失败');
} finally {
submitting.value = false;
}
}
// 页面加载时获取角色列表
onMounted(() => {
loadRoleList();
});
</script>
<style scoped lang="scss">
.role-manage {
padding: 20px;
.header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 20px;
h2 {
margin: 0;
color: #303133;
font-size: 20px;
font-weight: 600;
}
}
.el-table {
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
border-radius: 4px;
}
}
// 对话框样式优化
:deep(.el-dialog) {
.el-dialog__header {
padding: 20px 20px 10px;
border-bottom: 1px solid #ebeef5;
.el-dialog__title {
font-size: 16px;
font-weight: 600;
color: #303133;
}
}
.el-dialog__body {
padding: 20px;
}
.el-dialog__footer {
padding: 10px 20px 20px;
border-top: 1px solid #ebeef5;
}
}
// 表单样式优化
:deep(.el-form) {
.el-form-item__label {
font-weight: 500;
color: #606266;
}
.el-input__wrapper {
box-shadow: 0 0 0 1px #dcdfe6 inset;
&:hover {
box-shadow: 0 0 0 1px #c0c4cc inset;
}
&.is-focus {
box-shadow: 0 0 0 1px #409eff inset;
}
}
.el-textarea__inner {
box-shadow: 0 0 0 1px #dcdfe6 inset;
&:hover {
box-shadow: 0 0 0 1px #c0c4cc inset;
}
&:focus {
box-shadow: 0 0 0 1px #409eff inset;
}
}
}
// 按钮样式优化
:deep(.el-button) {
&.is-link {
padding: 0;
margin-right: 12px;
&:last-child {
margin-right: 0;
}
}
}
// 权限绑定容器样式
.permission-binding-container {
.role-info {
background: #f5f7fa;
padding: 15px;
border-radius: 4px;
margin-bottom: 20px;
h4 {
margin: 0 0 8px 0;
color: #303133;
font-size: 16px;
}
p {
margin: 0;
color: #606266;
font-size: 14px;
}
}
.binding-stats {
margin-top: 20px;
}
}
</style>

514
schoolNewsWeb/src/views/manage/system/UserManageView.vue Normal file
View File

@@ -0,0 +1,514 @@
<template>
<div class="user-manage">
<div class="header">
<h2>用户管理</h2>
<el-button type="primary" @click="handleAdd">
<el-icon><Plus /></el-icon>
新增用户
</el-button>
</div>
<el-table
:data="userList"
style="width: 100%"
v-loading="loading"
border
stripe
row-key="userID"
>
<el-table-column prop="username" label="用户名" min-width="120" />
<el-table-column prop="email" label="邮箱" min-width="180" />
<el-table-column prop="phone" label="手机号" min-width="120" />
<el-table-column prop="realName" label="真实姓名" min-width="100" />
<el-table-column prop="nickname" label="昵称" min-width="100" />
<el-table-column prop="status" label="状态" width="80">
<template #default="{ row }">
<el-tag :type="row.status === 0 ? 'success' : 'danger'">
{{ row.status === 0 ? '正常' : '禁用' }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="creatorName" label="创建人" width="120" />
<el-table-column prop="createTime" label="创建时间" width="180" />
<el-table-column label="操作" width="200" fixed="right">
<template #default="{ row }">
<el-button
type="primary"
size="small"
@click="handleEdit(row)"
link
>
编辑
</el-button>
<el-button
type="primary"
size="small"
@click="handleBindDeptRole(row)"
link
>
绑定部门角色
</el-button>
<el-button
type="danger"
size="small"
@click="handleDelete(row)"
link
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 新增/编辑用户对话框 -->
<el-dialog
v-model="userDialogVisible"
:title="isEdit ? '编辑用户' : '新增用户'"
width="600px"
@close="resetForm"
>
<el-form
ref="userFormRef"
:model="currentUser"
:rules="userFormRules"
label-width="100px"
>
<el-form-item label="用户名" prop="username">
<el-input v-model="currentUser.username" placeholder="请输入用户名" />
</el-form-item>
<el-form-item label="密码" prop="password" v-if="!isEdit">
<el-input
v-model="currentUser.password"
type="password"
placeholder="请输入密码"
show-password
/>
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="currentUser.email" placeholder="请输入邮箱" />
</el-form-item>
<el-form-item label="手机号" prop="phone">
<el-input v-model="currentUser.phone" placeholder="请输入手机号" />
</el-form-item>
<el-form-item label="真实姓名" prop="realName">
<el-input v-model="currentUser.realName" placeholder="请输入真实姓名" />
</el-form-item>
<el-form-item label="昵称" prop="nickname">
<el-input v-model="currentUser.nickname" placeholder="请输入昵称" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="currentUser.status" placeholder="请选择状态">
<el-option label="正常" :value="0" />
<el-option label="禁用" :value="1" />
</el-select>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="userDialogVisible = false">取消</el-button>
<el-button type="primary" @click="saveUser" :loading="submitting">
{{ isEdit ? '更新' : '创建' }}
</el-button>
</template>
</el-dialog>
<!-- 绑定部门角色对话框 -->
<el-dialog
v-model="bindDeptRoleDialogVisible"
title="绑定部门角色"
width="800px"
@close="resetBindForm"
>
<div class="bind-info">
<el-alert
:title="`用户：${currentUser.username} (${currentUser.realName})`"
type="info"
:closable="false"
style="margin-bottom: 20px"
/>
</div>
<el-table :data="bindList" style="width: 100%" border stripe>
<el-table-column width="80" label="绑定状态">
<template #default="{ row }">
<el-tag
:type="isSelected(row) ? 'success' : 'info'"
size="small"
>
{{ isSelected(row) ? '已绑定' : '未绑定' }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="deptName" label="部门" min-width="150" />
<el-table-column prop="roleName" label="角色" min-width="150" />
<el-table-column label="操作" width="100">
<template #default="{ row }">
<el-button
:type="isSelected(row) ? 'danger' : 'primary'"
size="small"
@click="toggleSelection(row)"
>
{{ isSelected(row) ? '解绑' : '绑定' }}
</el-button>
</template>
</el-table-column>
</el-table>
<div class="bind-stats" style="margin-top: 20px">
<el-alert
:title="`已绑定 ${selectedBindings.length} 个部门角色，未绑定 ${bindList.length - selectedBindings.length} 个部门角色`"
type="info"
:closable="false"
show-icon
/>
</div>
<template #footer>
<el-button @click="bindDeptRoleDialogVisible = false">取消</el-button>
<el-button type="primary" @click="saveBindings" :loading="submitting">
保存
</el-button>
</template>
</el-dialog>
</div>
</template>
<script setup lang="ts">
import { ref, onMounted } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { Plus } from '@element-plus/icons-vue';
import { userApi } from '@/apis/system/user';
import { deptApi } from '@/apis/system/dept';
import { roleApi } from '@/apis/system/role';
import type { SysUser, UserDeptRoleVO, UserVO, SysDeptRole} from '@/types';
// 扩展部门角色类型，包含绑定状态和显示信息
interface DeptRoleBindItem extends SysDeptRole {
deptName?: string;
roleName?: string;
isBound?: boolean;
}
// 响应式数据
const loading = ref(false);
const submitting = ref(false);
const userList = ref<UserVO[]>([]);
// 对话框控制
const userDialogVisible = ref(false);
const bindDeptRoleDialogVisible = ref(false);
const isEdit = ref(false);
// 当前操作的用户
const currentUser = ref<SysUser & { realName?: string; nickname?: string }>({});
// 绑定相关数据
const bindList = ref<DeptRoleBindItem[]>([]);
const selectedBindings = ref<string[]>([]); // 存储选中的绑定项的唯一标识
// 表单验证规则
const userFormRules = {
username: [
{ required: true, message: '请输入用户名', trigger: 'blur' }
],
password: [
{ required: true, message: '请输入密码', trigger: 'blur' }
],
email: [
{ required: true, message: '请输入邮箱', trigger: 'blur' },
{ type: 'email', message: '请输入正确的邮箱格式', trigger: 'blur' }
]
};
// 生成唯一标识
function getBindingKey(item: DeptRoleBindItem): string {
return `${item.deptID}_${item.roleID}`;
}
// 检查是否已选中
function isSelected(item: DeptRoleBindItem): boolean {
return selectedBindings.value.includes(getBindingKey(item));
}
// 切换选择状态
function toggleSelection(item: DeptRoleBindItem) {
const key = getBindingKey(item);
const index = selectedBindings.value.indexOf(key);
if (index > -1) {
selectedBindings.value.splice(index, 1);
} else {
selectedBindings.value.push(key);
}
}
// 加载用户列表
async function loadUserList() {
try {
loading.value = true;
const users = await userApi.getUserList({id: ""});
userList.value = users;
} catch (error) {
console.error('加载用户列表失败:', error);
ElMessage.error('加载用户列表失败');
} finally {
loading.value = false;
}
}
// 加载部门和角色数据用于名称映射
async function loadDeptAndRoleData() {
try {
const [depts, roles] = await Promise.all([
deptApi.getAllDepts(),
roleApi.getAllRoles()
]);
const deptMap = new Map(depts.map(d => [d.deptID, d.name || '未知部门']));
const roleMap = new Map(roles.map(r => [r.roleID, r.name || '未知角色']));
return { deptMap, roleMap };
} catch (error) {
console.error('加载部门角色数据失败:', error);
return { deptMap: new Map(), roleMap: new Map() };
}
}
// 加载部门角色绑定列表
async function loadDeptRoleList(): Promise<DeptRoleBindItem[]> {
try {
const [deptRoles, { deptMap, roleMap }] = await Promise.all([
deptApi.getDeptRoleList({id: ""}),
loadDeptAndRoleData()
]);
return deptRoles.map(item => ({
...item,
deptName: deptMap.get(item.deptID || '') || `部门${item.deptID}`,
roleName: roleMap.get(item.roleID || '') || `角色${item.roleID}`,
isBound: false // 初始状态为未绑定，需要根据实际绑定情况设置
}));
} catch (error) {
console.error('加载部门角色列表失败:', error);
return [];
}
}
// 新增用户
function handleAdd() {
isEdit.value = false;
currentUser.value = {};
userDialogVisible.value = true;
}
// 编辑用户
function handleEdit(row: UserVO) {
isEdit.value = true;
// 将UserVO转换为SysUser
currentUser.value = {
id: row.id,
username: row.username,
email: row.email,
phone: row.phone,
wechatID: row.wechatID,
status: row.status,
createTime: row.createTime,
updateTime: row.updateTime,
deleteTime: row.deleteTime,
deleted: row.deleted,
realName: row.realName,
nickname: row.nickname
};
userDialogVisible.value = true;
}
// 删除用户
async function handleDelete(row: UserVO) {
try {
await ElMessageBox.confirm(
`确定要删除用户 "${row.username}" 吗？`,
'确认删除',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}
);
await userApi.deleteUser(row);
ElMessage.success('删除成功');
await loadUserList();
} catch (error) {
if (error !== 'cancel') {
console.error('删除用户失败:', error);
ElMessage.error('删除用户失败');
}
}
}
// 保存用户
async function saveUser() {
try {
submitting.value = true;
if (isEdit.value) {
await userApi.updateUser(currentUser.value);
ElMessage.success('更新成功');
} else {
await userApi.createUser(currentUser.value);
ElMessage.success('创建成功');
}
userDialogVisible.value = false;
await loadUserList();
} catch (error) {
console.error('保存用户失败:', error);
ElMessage.error('保存用户失败');
} finally {
submitting.value = false;
}
}
// 绑定部门角色
async function handleBindDeptRole(row: UserVO) {
// 将UserVO转换为SysUser
currentUser.value = {
id: row.id,
username: row.username,
email: row.email,
phone: row.phone,
wechatID: row.wechatID,
status: row.status,
createTime: row.createTime,
updateTime: row.updateTime,
deleteTime: row.deleteTime,
deleted: row.deleted
};
try {
// 加载全部部门和角色数据
bindList.value = await loadDeptRoleList();
// 加载已绑定部门角色
const deptRoles = await userApi.getUserDeptRole({userID: currentUser.value.id});
// 初始化选中状态为已绑定的项
selectedBindings.value = bindList.value
.filter(item => deptRoles.some(deptRole =>
deptRole.deptID === item.deptID && deptRole.roleID === item.roleID
))
.map(item => getBindingKey(item));
bindDeptRoleDialogVisible.value = true;
} catch (error) {
console.error('加载绑定数据失败:', error);
ElMessage.error('加载绑定数据失败');
}
}
// 保存绑定设置
async function saveBindings() {
if (!currentUser.value || !currentUser.value.id) {
ElMessage.error('用户信息不完整');
return;
}
try {
submitting.value = true;
// 获取当前已绑定的部门角色
const currentBoundItems = await userApi.getUserDeptRole({userID: currentUser.value.id});
const currentBoundKeys = currentBoundItems.map(item => `${item.deptID}_${item.roleID}`);
// 找出需要绑定的项（新增的）
const itemsToBind = bindList.value.filter(item => {
const key = getBindingKey(item);
return selectedBindings.value.includes(key) && !currentBoundKeys.includes(key);
});
// 找出需要解绑的项（移除的）
const itemsToUnbind = bindList.value.filter(item => {
const key = getBindingKey(item);
return !selectedBindings.value.includes(key) && currentBoundKeys.includes(key);
});
// 执行绑定操作 - 一次性发送所有绑定项
if (itemsToBind.length > 0) {
const userDeptRoleVO: UserDeptRoleVO = {
user: currentUser.value,
users: [currentUser.value],
userDeptRoles: itemsToBind.map(item => ({
deptID: item.deptID,
roleID: item.roleID
}))
};
await userApi.bindUserDeptRole(userDeptRoleVO);
}
// 执行解绑操作 - 一次性发送所有解绑项
if (itemsToUnbind.length > 0) {
const userDeptRoleVO: UserDeptRoleVO = {
user: currentUser.value,
users: [currentUser.value],
userDeptRoles: itemsToUnbind.map(item => ({
deptID: item.deptID,
roleID: item.roleID
}))
};
await userApi.unbindUserDeptRole(userDeptRoleVO);
}
ElMessage.success('部门角色绑定保存成功');
bindDeptRoleDialogVisible.value = false;
// 刷新用户列表
await loadUserList();
} catch (error) {
console.error('保存部门角色绑定失败:', error);
ElMessage.error('保存部门角色绑定失败');
} finally {
submitting.value = false;
}
}
// 重置表单
function resetForm() {
currentUser.value = {};
}
// 重置绑定表单
function resetBindForm() {
bindList.value = [];
selectedBindings.value = [];
}
// 组件挂载时加载数据
onMounted(() => {
loadUserList();
});
</script>
<style scoped>
.user-manage {
padding: 20px;
}
.header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 20px;
}
.header h2 {
margin: 0;
}
.bind-info {
margin-bottom: 20px;
}
.bind-stats {
margin-top: 20px;
}
</style>