From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
index 50451ac..9761456 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
@@ -5,24 +5,39 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.controller.dto.UserDTO;
+import com.example.erp.entity.userInfo.PermissionBasic;
+import com.example.erp.entity.userInfo.Role;
+import com.example.erp.entity.userInfo.SysError;
import com.example.erp.entity.userInfo.User;
-import com.example.erp.mapper.userInfo.UserMapper;
+import com.example.erp.mapper.userInfo.*;
import com.example.erp.tools.TokenTools;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Service
@DS("user_info")
public class UserService {
private final UserMapper userMapper;
+ private final RoleMapper roleMapper;
+ private final UserRoleMapper userRoleMapper;
- public UserService(UserMapper userMapper) {
+ private final PermissionRoleMapper permissionRoleMapper;
+
+ public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper, UserRoleMapper userRoleMapper) {
this.userMapper = userMapper;
+ this.roleMapper = roleMapper;
+ this.permissionRoleMapper = permissionRoleMapper;
+ this.userRoleMapper = userRoleMapper;
}
@@ -67,6 +82,32 @@
return returnUser;
}
+ @Transactional
+ public Boolean updatePassWord(Map<String,Object> object) {
+ boolean saveState = false;
+ int userId =0;
+ String oldPassWord = "";
+ String passWord = "";
+ if (object.get("userId") != null) {
+ userId = Integer.parseInt(object.get("userId").toString());
+ }
+ if (object.get("oldPassword") != null) {
+ oldPassWord = object.get("oldPassword").toString();
+ }
+ if (object.get("password") != null) {
+ passWord = object.get("password").toString();
+ }
+
+ User user =userMapper.findOnePassWord(userId,oldPassWord);
+ if (user!=null){
+ if (userMapper.updatePassWordById(userId,passWord)){
+ saveState = true;
+ }
+ }
+ return saveState;
+
+ }
+
/*----------------鏂扮増鏈櫥闄�*/
public UserDTO doLogin(UserDTO userDTO) {
User user = userMapper.selectOne(new QueryWrapper<User>().
@@ -80,6 +121,8 @@
userDTO.setId(user.getId());
userDTO.setUserName(user.getUserName());
userDTO.setToken(StpUtil.getTokenValue());
+ Boolean userIsAdmin= userRoleMapper.getUserIsAdmin(user.getId());
+ userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId(),userIsAdmin));
return userDTO;
}else{
return null;
@@ -96,12 +139,26 @@
return true;
}
- public List<User> findAll() {
+ public Map<String,List<Object>> findAll() {
List<User> users = userMapper.findAll();
users.forEach(user -> {
user.setPassword(null);
});
- return users;
+ Map<String,List<Object>> map = new HashMap<>();
+
+ map.put("users", Collections.singletonList(users));
+ map.put("role", Collections.singletonList(
+ roleMapper.selectList(
+ new QueryWrapper<Role>()
+ .ne("role","admin")
+ )
+ ));
+ return map;
+ }
+
+ public Boolean userDelete(Integer id) {
+
+ return userMapper.userDelete(id);
}
}
--
Gitblit v1.8.0