From 5e2ebcceae4bc34b46370f2c10110cd72e7f4fba Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 22 八月 2024 10:59:29 +0800
Subject: [PATCH] 修改权限相关
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 133 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 123 insertions(+), 10 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 638966a..54c4a1c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -1,9 +1,17 @@
package com.ruoyi.system.service.impl;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
+import javax.annotation.Resource;
import javax.validation.Validator;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.service.ZInfoUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,8 +44,7 @@
* @author ruoyi
*/
@Service
-public class SysUserServiceImpl implements ISysUserService
-{
+public class SysUserServiceImpl implements ISysUserService {
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
@Autowired
@@ -53,6 +60,9 @@
private SysUserRoleMapper userRoleMapper;
@Autowired
+ private SysUserRoleMapper sysUserRoleMapper;
+
+ @Autowired
private SysUserPostMapper userPostMapper;
@Autowired
@@ -60,6 +70,19 @@
@Autowired
protected Validator validator;
+
+ @Resource
+ private ZInfoUserService zInfoUserService;
+
+ @Override
+ public List<String> findUserNames(Long[] ids) {
+ List<String> usNames = userMapper.findUserNames(ids).stream().map(SysUser::getUserName).collect(Collectors.toList());
+ //.stream().map(SysUser::getUserName).collect(Collectors.toList());;
+ System.out.println("99999999999900000000000");
+ System.out.println(usNames);
+ //.stream().map(SysUser::getUserName).collect(Collectors.toList());
+ return usNames;
+ }
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
@@ -234,6 +257,7 @@
@Override
public void checkUserDataScope(Long userId)
{
+ //鍒ゆ柇鏄惁鏄鐞嗗憳
if (!SysUser.isAdmin(SecurityUtils.getUserId()))
{
SysUser user = new SysUser();
@@ -262,6 +286,8 @@
insertUserPost(user);
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
insertUserRole(user);
+
+
return rows;
}
@@ -274,7 +300,16 @@
@Override
public boolean registerUser(SysUser user)
{
- return userMapper.insertUser(user) > 0;
+ int satisfyCount = userMapper.insertUser(user);
+ if (satisfyCount > 0) {
+ List<SysUserRole> roleList = new ArrayList<>();
+ SysUserRole roleId = new SysUserRole();
+ roleId.setUserId(user.getUserId());
+ roleId.setRoleId(2L);
+ roleList.add(roleId);
+ sysUserRoleMapper.batchUserRole(roleList);
+ }
+ return satisfyCount > 0;
}
/**
@@ -289,13 +324,16 @@
{
Long userId = user.getUserId();
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
- userRoleMapper.deleteUserRoleByUserId(userId);
- // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
- insertUserRole(user);
+// userRoleMapper.deleteUserRoleByUserId(userId);
+// // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
+// insertUserRole(user);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
userPostMapper.deleteUserPostByUserId(userId);
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
insertUserPost(user);
+
+ //鏇存柊鐢ㄦ埛淇℃伅琛�
+
return userMapper.updateUser(user);
}
@@ -446,7 +484,7 @@
userRoleMapper.deleteUserRoleByUserId(userId);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
userPostMapper.deleteUserPostByUserId(userId);
- return userMapper.deleteUserById(userId);
+ return userMapper.deleteById(userId);
}
/**
@@ -468,7 +506,29 @@
userRoleMapper.deleteUserRole(userIds);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
userPostMapper.deleteUserPost(userIds);
- return userMapper.deleteUserByIds(userIds);
+ //鎵惧埌鐢ㄦ埛鍚�
+
+ for(long uid : userIds) {
+ // System.out.println(name.equals(""));
+ // System.out.println(name==null);
+
+ // if(name!="" || name != null) {
+ ZInfoUser fs = zInfoUserService.getInfoBysysId(uid);
+
+ if(fs!=null)
+ {
+ userMapper.deleteUserById(uid);
+ }
+ else
+ {
+ userMapper.deleteById(uid);
+ }
+ // }
+ }
+
+ return 1;
+// zInfoUserService.removeByUserName( findUserNames(userIds));
+
}
/**
@@ -491,6 +551,8 @@
StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder();
String password = configService.selectConfigByKey("sys.user.initPassword");
+ List<SysUserRole> roleList = new ArrayList<>();
+
for (SysUser user : userList)
{
try
@@ -503,7 +565,12 @@
user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName);
this.insertUser(user);
+ SysUserRole roleId = new SysUserRole();
+ roleId.setUserId(user.getUserId());
+ roleId.setRoleId(2L);
+ roleList.add(roleId);
successNum++;
+
successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆鎴愬姛");
}
else if (isUpdateSupport)
@@ -530,6 +597,7 @@
log.error(msg, e);
}
}
+ sysUserRoleMapper.batchUserRole(roleList);
if (failureNum > 0)
{
failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝ｇ‘锛岄敊璇涓嬶細");
@@ -541,4 +609,49 @@
}
return successMsg.toString();
}
+
+ @Override
+ public boolean saveBatch(Collection<SysUser> entityList, int batchSize) {
+ return false;
+ }
+
+ @Override
+ public boolean saveOrUpdateBatch(Collection<SysUser> entityList, int batchSize) {
+ return false;
+ }
+
+ @Override
+ public boolean updateBatchById(Collection<SysUser> entityList, int batchSize) {
+ return false;
+ }
+
+ @Override
+ public boolean saveOrUpdate(SysUser entity) {
+ return false;
+ }
+
+ @Override
+ public SysUser getOne(Wrapper<SysUser> queryWrapper, boolean throwEx) {
+ return null;
+ }
+
+ @Override
+ public Map<String, Object> getMap(Wrapper<SysUser> queryWrapper) {
+ return null;
+ }
+
+ @Override
+ public <V> V getObj(Wrapper<SysUser> queryWrapper, Function<? super Object, V> mapper) {
+ return null;
+ }
+
+ @Override
+ public BaseMapper<SysUser> getBaseMapper() {
+ return null;
+ }
+
+ @Override
+ public Class<SysUser> getEntityClass() {
+ return null;
+ }
}
--
Gitblit v1.9.1