From 020fcb1311aa00e29f473c001104ee3756321b03 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 22 十月 2024 09:02:51 +0800
Subject: [PATCH] 提交价格审核部分功能

---
 north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java |   90 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 85 insertions(+), 5 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..e5d3c54 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,10 +82,58 @@
         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>().
-                eq("login_name", userDTO.getUserId()).eq("password", userDTO.getPass()));
+                eq("login_name", userDTO.getUserId())
+                .eq("password", userDTO.getPass())
+                .eq("state",1)
+        );
         if(user!=null){
             //妫�鏌ユ槸璁╂湁鐧诲綍锛屾湁鐧诲綍鐩存帴閫�鍑�
             StpUtil.logout(user.getId());
@@ -79,7 +142,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;
@@ -96,12 +162,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