From edfa49f201d3fc8fc6b51b700e91f80246660855 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 二月 2024 20:29:14 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java
index b21c138..81953c4 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/service/impl/UserServiceImpl.java
@@ -1,12 +1,58 @@
package com.zy.asrs.wcs.sys.service.impl;
-import com.zy.asrs.wcs.sys.mapper.UserMapper;
-import com.zy.asrs.wcs.sys.entity.User;
-import com.zy.asrs.wcs.sys.service.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.wcs.sys.entity.User;
+import com.zy.asrs.wcs.sys.mapper.UserMapper;
+import com.zy.asrs.wcs.sys.service.RoleMenuService;
+import com.zy.asrs.wcs.sys.service.UserRoleService;
+import com.zy.asrs.wcs.sys.service.UserService;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
@Service("userService")
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
+ @Resource
+ private UserRoleService userRoleService;
+ @Resource
+ private RoleMenuService roleMenuService;
+ @Resource
+ private BCryptPasswordEncoder bCryptPasswordEncoder;
+
+ @Override
+ public User getByUsername(String username, Long hostId) {
+ if (Cools.isEmpty(username)) {
+ return null;
+ }
+ User user = baseMapper.selectByUsername(username, hostId);
+ if (user != null) {
+ user.setRoles(userRoleService.listByUserId(user.getId()));
+ user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
+ }
+ return user;
+ }
+
+ @Override
+ public User getByIdRel(Long userId) {
+ User user = this.getById(userId);
+ if (user != null) {
+ user.setRoles(userRoleService.listByUserId(user.getId()));
+ user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
+ }
+ return user;
+ }
+
+ @Override
+ public boolean comparePassword(String dbPassword, String inputPassword) {
+ return bCryptPasswordEncoder.matches(inputPassword, dbPassword);
+ }
+
+ @Override
+ public String encodePassword(String password) {
+ return password == null ? null : bCryptPasswordEncoder.encode(password);
+ }
+
}
--
Gitblit v1.9.1