From 4fd5b05a139e7d106c33ca7a6eabd153f8060676 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 08 八月 2024 13:46:39 +0800
Subject: [PATCH] 修改精度丢失
---
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 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 5b4ede4..d3ffa44 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,16 +5,18 @@
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.RoleMapper;
-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;
@@ -27,10 +29,15 @@
private final UserMapper userMapper;
private final RoleMapper roleMapper;
+ private final UserRoleMapper userRoleMapper;
- public UserService(UserMapper userMapper, RoleMapper roleMapper) {
+ 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;
}
@@ -75,6 +82,51 @@
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;
+
+ }
+
+ @Transactional
+ public Boolean updateUserName(Map<String,Object> object) {
+ boolean saveState = false;
+ int userId =0;
+ String userName = "";
+ if (object.get("userId") != null) {
+ userId = Integer.parseInt(object.get("userId").toString());
+ }
+ if (object.get("userName") != null) {
+ userName = object.get("userName").toString();
+ }
+
+ if (userMapper.updateUserNameById(userId,userName)){
+ saveState = true;
+ }
+ return saveState;
+
+ }
+
/*----------------鏂扮増鏈櫥闄�*/
public UserDTO doLogin(UserDTO userDTO) {
User user = userMapper.selectOne(new QueryWrapper<User>().
@@ -87,7 +139,10 @@
userDTO.setPass(null);
userDTO.setId(user.getId());
userDTO.setUserName(user.getUserName());
+ userDTO.setAddress(user.getAddress());
userDTO.setToken(StpUtil.getTokenValue());
+ Boolean userIsAdmin= userRoleMapper.getUserIsAdmin(user.getId());
+ userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId(),userIsAdmin));
return userDTO;
}else{
return null;
--
Gitblit v1.8.0