lbqms.git - Gitblit

			@@ -3,12 +3,14 @@
			import cn.hutool.core.lang.Validator;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.ruoyi.common.annotation.DataScope;
			import com.ruoyi.common.constant.UserConstants;
			import com.ruoyi.common.core.domain.entity.SysRole;
			import com.ruoyi.common.core.domain.entity.SysUser;
			import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
			import com.ruoyi.common.core.page.TableDataInfo;
			import com.ruoyi.common.exception.CustomException;
			import com.ruoyi.common.utils.PageUtils;
			import com.ruoyi.common.utils.SecurityUtils;
			import com.ruoyi.system.domain.SysPost;
			import com.ruoyi.system.domain.SysUserPost;
			@@ -16,8 +18,7 @@
			import com.ruoyi.system.mapper.*;
			import com.ruoyi.system.service.ISysConfigService;
			import com.ruoyi.system.service.ISysUserService;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			@@ -31,12 +32,9 @@
			*
			* @author ruoyi
			*/
			@Slf4j
			@Service
			public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
			private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);

			@Autowired
			private SysUserMapper userMapper;
			public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser, SysUser> implements ISysUserService {

			@Autowired
			private SysRoleMapper roleMapper;
			@@ -53,6 +51,12 @@
			@Autowired
			private ISysConfigService configService;

			@Override
			@DataScope(deptAlias = "d", userAlias = "u", isUser = true)
			public TableDataInfo<SysUser> selectPageUserList(SysUser user) {
			return PageUtils.buildDataInfo(baseMapper.selectPageUserList(PageUtils.buildPage(), user));
			}

			/**
			* 根据条件分页查询用户列表
			*
			@@ -60,9 +64,33 @@
			* @return 用户信息集合信息
			*/
			@Override
			@DataScope(deptAlias = "d", userAlias = "u")
			@DataScope(deptAlias = "d", userAlias = "u", isUser = true)
			public List<SysUser> selectUserList(SysUser user) {
			return userMapper.selectUserList(user);
			return baseMapper.selectUserList(user);
			}

			/**
			* 根据条件分页查询已分配用户角色列表
			*
			* @param user 用户信息
			* @return 用户信息集合信息
			*/
			@Override
			@DataScope(deptAlias = "d", userAlias = "u", isUser = true)
			public TableDataInfo<SysUser> selectAllocatedList(SysUser user) {
			return PageUtils.buildDataInfo(baseMapper.selectAllocatedList(PageUtils.buildPage(), user));
			}

			/**
			* 根据条件分页查询未分配用户角色列表
			*
			* @param user 用户信息
			* @return 用户信息集合信息
			*/
			@Override
			@DataScope(deptAlias = "d", userAlias = "u", isUser = true)
			public TableDataInfo<SysUser> selectUnallocatedList(SysUser user) {
			return PageUtils.buildDataInfo(baseMapper.selectUnallocatedList(PageUtils.buildPage(), user));
			}

			/**
			@@ -73,7 +101,7 @@
			*/
			@Override
			public SysUser selectUserByUserName(String userName) {
			return userMapper.selectUserByUserName(userName);
			return baseMapper.selectUserByUserName(userName);
			}

			/**
			@@ -84,7 +112,7 @@
			*/
			@Override
			public SysUser selectUserById(Long userId) {
			return userMapper.selectUserById(userId);
			return baseMapper.selectUserById(userId);
			}

			/**
			@@ -96,7 +124,7 @@
			@Override
			public String selectUserRoleGroup(String userName) {
			List<SysRole> list = roleMapper.selectRolesByUserName(userName);
			StringBuffer idsStr = new StringBuffer();
			StringBuilder idsStr = new StringBuilder();
			for (SysRole role : list) {
			idsStr.append(role.getRoleName()).append(",");
			}
			@@ -115,7 +143,7 @@
			@Override
			public String selectUserPostGroup(String userName) {
			List<SysPost> list = postMapper.selectPostsByUserName(userName);
			StringBuffer idsStr = new StringBuffer();
			StringBuilder idsStr = new StringBuilder();
			for (SysPost post : list) {
			idsStr.append(post.getPostName()).append(",");
			}
			@@ -198,7 +226,7 @@
			@Transactional
			public int insertUser(SysUser user) {
			// 新增用户信息
			int rows = userMapper.insert(user);
			int rows = baseMapper.insert(user);
			// 新增用户岗位关联
			insertUserPost(user);
			// 新增用户与角色管理
			@@ -224,7 +252,22 @@
			userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId,userId));
			// 新增用户与岗位管理
			insertUserPost(user);
			return userMapper.updateById(user);
			return baseMapper.updateById(user);
			}

			/**
			* 用户授权角色
			*
			* @param userId 用户ID
			* @param roleIds 角色组
			*/
			@Override
			@Transactional
			public void insertUserAuth(Long userId, Long[] roleIds)
			{
			userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
			.eq(SysUserRole::getUserId, userId));
			insertUserRole(userId, roleIds);
			}

			/**
			@@ -235,7 +278,7 @@
			*/
			@Override
			public int updateUserStatus(SysUser user) {
			return userMapper.updateById(user);
			return baseMapper.updateById(user);
			}

			/**
			@@ -246,19 +289,19 @@
			*/
			@Override
			public int updateUserProfile(SysUser user) {
			return userMapper.updateById(user);
			return baseMapper.updateById(user);
			}

			/**
			* 修改用户头像
			*
			* @param userName 用户名
			* @param avatar 头像地址
			* @param avatar 头像地址
			* @return 结果
			*/
			@Override
			public boolean updateUserAvatar(String userName, String avatar) {
			return userMapper.update(null,
			return baseMapper.update(null,
			new LambdaUpdateWrapper<SysUser>()
			.set(SysUser::getAvatar,avatar)
			.eq(SysUser::getUserName,userName)) > 0;
			@@ -272,7 +315,7 @@
			*/
			@Override
			public int resetPwd(SysUser user) {
			return userMapper.updateById(user);
			return baseMapper.updateById(user);
			}

			/**
			@@ -284,7 +327,7 @@
			*/
			@Override
			public int resetUserPwd(String userName, String password) {
			return userMapper.update(null,
			return baseMapper.update(null,
			new LambdaUpdateWrapper<SysUser>()
			.set(SysUser::getPassword,password)
			.eq(SysUser::getUserName,userName));
			@@ -307,9 +350,7 @@
			list.add(ur);
			}
			if (list.size() > 0) {
			for (SysUserRole sysUserRole : list) {
			userRoleMapper.insert(sysUserRole);
			}
			userRoleMapper.insertAll(list);
			}
			}
			}
			@@ -331,9 +372,29 @@
			list.add(up);
			}
			if (list.size() > 0) {
			for (SysUserPost sysUserPost : list) {
			userPostMapper.insert(sysUserPost);
			}
			userPostMapper.insertAll(list);
			}
			}
			}

			/**
			* 新增用户角色信息
			*
			* @param userId 用户ID
			* @param roleIds 角色组
			*/
			public void insertUserRole(Long userId, Long[] roleIds) {
			if (Validator.isNotNull(roleIds)) {
			// 新增用户与角色管理
			List<SysUserRole> list = new ArrayList<SysUserRole>();
			for (Long roleId : roleIds) {
			SysUserRole ur = new SysUserRole();
			ur.setUserId(userId);
			ur.setRoleId(roleId);
			list.add(ur);
			}
			if (list.size() > 0) {
			userRoleMapper.insertAll(list);
			}
			}
			}
			@@ -351,7 +412,7 @@
			userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId,userId));
			// 删除用户与岗位表
			userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId,userId));
			return userMapper.deleteById(userId);
			return baseMapper.deleteById(userId);
			}

			/**
			@@ -371,15 +432,15 @@
			userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId,ids));
			// 删除用户与岗位表
			userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getUserId,ids));
			return userMapper.deleteBatchIds(ids);
			return baseMapper.deleteBatchIds(ids);
			}

			/**
			* 导入用户数据
			*
			* @param userList 用户数据列表
			* @param userList 用户数据列表
			* @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
			* @param operName 操作用户
			* @param operName 操作用户
			* @return 结果
			*/
			@Override
			@@ -395,7 +456,7 @@
			for (SysUser user : userList) {
			try {
			// 验证是否存在这个用户
			SysUser u = userMapper.selectUserByUserName(user.getUserName());
			SysUser u = baseMapper.selectUserByUserName(user.getUserName());
			if (Validator.isNull(u)) {
			user.setPassword(SecurityUtils.encryptPassword(password));
			user.setCreateBy(operName);