From 866c5588d497cbf28a940775a47869bd2508a69f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 28 四月 2024 14:15:19 +0800
Subject: [PATCH] 用户功能完成
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java | 124 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 114 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
index b8f3259..001b1fa 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
@@ -1,15 +1,24 @@
package com.mes.userinfo.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.common.config.Const;
import com.mes.common.utils.JwtUtil;
import com.mes.common.utils.RedisUtil;
import com.mes.menu.mapper.SysMenuMapper;
+import com.mes.role.entity.SysRole;
import com.mes.userinfo.entity.LoginUser;
import com.mes.userinfo.entity.SysUser;
+import com.mes.userinfo.entity.SysUserRole;
+import com.mes.userinfo.entity.request.UserRequest;
+import com.mes.userinfo.entity.vo.SysUserVO;
import com.mes.userinfo.mapper.SysUserMapper;
+import com.mes.userinfo.service.SysUserRoleService;
import com.mes.userinfo.service.SysUserService;
-import com.mes.utils.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -18,12 +27,15 @@
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -34,18 +46,26 @@
* @since 2024-04-11
*/
@Service
+@Slf4j
public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService, UserDetailsService {
@Autowired
private AuthenticationManager authenticationManager;
+
@Autowired
private RedisUtil redisUtil;
@Resource
private SysMenuMapper sysMenuMapper;
+ @Resource
+ private SysUserRoleService sysUserRoleService;
+
+ @Autowired
+ BCryptPasswordEncoder passwordEncoder;
+
@Override
- public Result login(SysUser user) {
+ public Map<String, String> login(SysUser user) {
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(user.getUserName(), user.getPassword());
Authentication authenticate = authenticationManager.authenticate(authenticationToken);
if (Objects.isNull(authenticate)) {
@@ -54,24 +74,93 @@
//浣跨敤userid鐢熸垚token
LoginUser loginUser = (LoginUser) authenticate.getPrincipal();
String userId = loginUser.getUser().getId().toString();
- String jwt = JwtUtil.generateToken(userId);
+ String jwt = JwtUtil.createJWT(userId);
+
+ //鏌ヨ鏉冮檺淇℃伅
+// List<String> perms = sysMenuMapper.selectPermsByUserId(userId);
//authenticate瀛樺叆redis
- redisUtil.setCacheObject("login:" + userId, loginUser);
+ redisUtil.setCacheObject("login:" + userId, loginUser.getAuthorities());
//鎶妕oken鍝嶅簲缁欏墠绔�
HashMap<String, String> map = new HashMap<>();
map.put("token", jwt);
- return Result.success(map);
+ return map;
}
@Override
- public Result logout() {
+ public String logout() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
LoginUser loginUser = (LoginUser) authentication.getPrincipal();
Long userid = loginUser.getUser().getId();
redisUtil.deleteObject("login:" + userid);
- return Result.success("閫�鍑烘垚鍔�");
+ return "娉ㄩ攢鎴愬姛";
}
+ @Transactional
+ @Override
+ public String saveUser(SysUserVO user) {
+ log.info("淇濆瓨鐢ㄦ埛淇℃伅");
+ // 榛樿瀵嗙爜
+ String password = passwordEncoder.encode(Const.DEFULT_PASSWORD);
+ user.setPassword(password);
+ SysUser sysUser = new SysUser();
+ BeanUtils.copyProperties(user, sysUser);
+ this.save(sysUser);
+ saveUserRole(user.getRoleList(), sysUser.getId());
+ return "success";
+ }
+
+ @Transactional
+ @Override
+ public SysUserVO updateUser(SysUserVO user) {
+ log.info("鏇存柊鐢ㄦ埛淇℃伅");
+ SysUser sysUser = new SysUser();
+ BeanUtils.copyProperties(user, sysUser);
+ this.updateById(sysUser);
+ log.info("鍒犻櫎鐢ㄦ埛瑙掕壊淇℃伅");
+ sysUserRoleService.removeByIds(user.getRoleList());
+ log.info("淇濆瓨鐢ㄦ埛瑙掕壊淇℃伅");
+ saveUserRole(user.getRoleList(), sysUser.getId());
+ return null;
+ }
+
+ @Override
+ public String resetPassword(Long userId) {
+ log.info("閲嶇疆瀵嗙爜涓簕}", Const.DEFULT_PASSWORD);
+ SysUser sysUser = new SysUser();
+ sysUser.setId(userId);
+ String password = passwordEncoder.encode(Const.DEFULT_PASSWORD);
+ sysUser.setPassword(password);
+ this.updateById(sysUser);
+ return "success";
+ }
+
+ @Override
+ public List<SysUserVO> listByUserName(UserRequest request) {
+ MPJLambdaWrapper<SysUser> wrapper = new MPJLambdaWrapper<>();
+ wrapper.selectAll(SysUser.class)
+ .selectCollection(SysRole.class, SysUserVO::getRoleList)
+ .leftJoin(SysUserRole.class, SysUserRole::getUserId, SysUser::getId)
+ .leftJoin(SysRole.class, SysRole::getId, SysUserRole::getRoleId)
+ .like(StringUtils.hasText(request.getUserName()), SysUser::getUserName, request.getUserName());
+ return baseMapper.selectJoinList(SysUserVO.class, wrapper);
+ }
+
+ @Transactional
+ @Override
+ public String deleteUser(List<Long> ids) {
+ this.removeByIds(ids);
+ sysUserRoleService.remove(new QueryWrapper<SysUserRole>().in("user_id", ids));
+ return "success";
+
+ }
+
+ /**
+ * 瀹炵幇UserDetailsService鎺ュ彛锛屼粠鏁版嵁搴撳唴鑾峰彇鐢ㄦ埛鍙婃潈闄愪俊鎭�
+ *
+ * @param username
+ * @return
+ * @throws UsernameNotFoundException
+ */
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
@@ -86,4 +175,19 @@
return new LoginUser(user, perms);
}
+
+
+ private void saveUserRole(List<SysRole> roles, Long userId) {
+ log.info("淇濆瓨鐢ㄦ埛瑙掕壊淇℃伅");
+ List<SysUserRole> userRoles = new ArrayList<>();
+ if (CollectionUtils.isEmpty(roles)) {
+ log.info("淇濆瓨鐢ㄦ埛瑙掕壊淇℃伅涓虹┖锛岀粰榛樿鏅�氱敤鎴疯鑹�");
+ userRoles.add(new SysUserRole(userId, Const.DEFULT_ROLE));
+ } else {
+ log.info("淇濆瓨鐢ㄦ埛瑙掕壊淇℃伅");
+ userRoles = roles.stream().map(e -> new SysUserRole(userId, e.getId())).collect(Collectors.toList());
+ }
+ sysUserRoleService.saveBatch(userRoles);
+ }
+
}
--
Gitblit v1.8.0