From 0abccf5e570dce53a802bca4ce25118dd900692c Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 23 二月 2024 14:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 414 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 260 insertions(+), 154 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 f6d605c..a37f029 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,10 +1,24 @@
package com.ruoyi.system.service.impl;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
+import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.validation.Validator;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
+import com.ruoyi.alarm.config.mapper.ArdAlarmTypeConfigMapper;
+import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.mapper.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,22 +37,16 @@
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.mapper.SysPostMapper;
-import com.ruoyi.system.mapper.SysRoleMapper;
-import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.mapper.SysUserPostMapper;
-import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
/**
* 鐢ㄦ埛 涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
*/
@Service
-public class SysUserServiceImpl implements ISysUserService
-{
+public class SysUserServiceImpl implements ISysUserService {
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
@Resource
@@ -61,82 +69,141 @@
@Autowired
protected Validator validator;
+ @Resource
+ private RedisCache redisCache;
+ @Resource
+ private ArdAlarmTypeConfigMapper ardAlarmTypeConfigMapper;
+
+ @Resource
+ private SysDeptMapper sysDeptMapper;
/**
- * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
- *
- * @param user 鐢ㄦ埛淇℃伅
- * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
+ * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨
*/
- @Override
- @DataScope(deptAlias = "d", userAlias = "u")
- public List<SysUser> selectUserList(SysUser user)
- {
- return userMapper.selectUserList(user);
+ @PostConstruct
+ public void init() {
+ loadingUserCache();
}
/**
- * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
- *
+ * 鍔犺浇鐢ㄦ埛缂撳瓨鏁版嵁
+ */
+ @Override
+ public void loadingUserCache() {
+ List<SysUser> sysUsers = userMapper.selectUserList(new SysUser());
+ for (SysUser sysUser : sysUsers) {
+ redisCache.setCacheObject(getCacheKey(sysUser.getUserId()), sysUser);
+ }
+ }
+
+ /**
+ * 娓呯┖鐢ㄦ埛缂撳瓨鏁版嵁
+ */
+ @Override
+ public void clearUserCache() {
+ Collection<String> keys = redisCache.keys(CacheConstants.USER_LIST_KEY + "*");
+ redisCache.deleteObject(keys);
+ }
+
+ /**
+ * 娓呯┖鐢ㄦ埛缂撳瓨鏁版嵁鎸夌敤鎴穒ds鏁扮粍
+ *
+ * @param userIds 鐢ㄦ埛id鏁扮粍
+ */
+ @Override
+ public void clearUserCache(String[] userIds) {
+ for (String userId : userIds) {
+ redisCache.deleteObject(userId);
+ }
+ }
+
+ /**
+ * 閲嶇疆鐢ㄦ埛缂撳瓨鏁版嵁
+ */
+ @Override
+ public void resetUserCache() {
+ clearUserCache();
+ loadingUserCache();
+ }
+
+ /**
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
- public List<SysUser> selectAllocatedList(SysUser user)
- {
+ public List<SysUser> selectUserList(SysUser user) {
+ return userMapper.selectUserList(user);
+ }
+ /**
+ * 鑾峰彇App鍗曞叺鍜屾寚鎸ョ鐢ㄦ埛鍒楄〃
+ *
+ * @param user APP鐢ㄦ埛淇℃伅
+ * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
+ */
+ @Override
+// @DataScope(deptAlias = "d", userAlias = "u")
+ public List<SysUser> selectAllAppUserList(SysUser user) {
+ return userMapper.selectAllAppUserList(user);
+ }
+ /**
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
+ */
+ @Override
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public List<SysUser> selectAllocatedList(SysUser user) {
return userMapper.selectAllocatedList(user);
}
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
- public List<SysUser> selectUnallocatedList(SysUser user)
- {
+ public List<SysUser> selectUnallocatedList(SysUser user) {
return userMapper.selectUnallocatedList(user);
}
/**
* 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�
- *
+ *
* @param userName 鐢ㄦ埛鍚�
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
@Override
- public SysUser selectUserByUserName(String userName)
- {
+ public SysUser selectUserByUserName(String userName) {
return userMapper.selectUserByUserName(userName);
}
/**
* 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
- *
+ *
* @param userId 鐢ㄦ埛ID
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
@Override
- public SysUser selectUserById(String userId)
- {
+ public SysUser selectUserById(String userId) {
return userMapper.selectUserById(userId);
}
/**
* 鏌ヨ鐢ㄦ埛鎵�灞炶鑹茬粍
- *
+ *
* @param userName 鐢ㄦ埛鍚�
* @return 缁撴灉
*/
@Override
- public String selectUserRoleGroup(String userName)
- {
+ public String selectUserRoleGroup(String userName) {
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
- if (CollectionUtils.isEmpty(list))
- {
+ if (CollectionUtils.isEmpty(list)) {
return StringUtils.EMPTY;
}
return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
@@ -144,16 +211,14 @@
/**
* 鏌ヨ鐢ㄦ埛鎵�灞炲矖浣嶇粍
- *
+ *
* @param userName 鐢ㄦ埛鍚�
* @return 缁撴灉
*/
@Override
- public String selectUserPostGroup(String userName)
- {
+ public String selectUserPostGroup(String userName) {
List<SysPost> list = postMapper.selectPostsByUserName(userName);
- if (CollectionUtils.isEmpty(list))
- {
+ if (CollectionUtils.isEmpty(list)) {
return StringUtils.EMPTY;
}
return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
@@ -161,17 +226,15 @@
/**
* 鏍￠獙鐢ㄦ埛鍚嶇О鏄惁鍞竴
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
@Override
- public String checkUserNameUnique(SysUser user)
- {
+ public String checkUserNameUnique(SysUser user) {
String userId = StringUtils.isNull(user.getUserId()) ? "-1" : user.getUserId();
SysUser info = userMapper.checkUserNameUnique(user.getUserName());
- if (StringUtils.isNotNull(info) && !info.getUserId().equals(userId))
- {
+ if (StringUtils.isNotNull(info) && !info.getUserId().equals(userId)) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -184,12 +247,10 @@
* @return
*/
@Override
- public String checkPhoneUnique(SysUser user)
- {
+ public String checkPhoneUnique(SysUser user) {
String userId = StringUtils.isNull(user.getUserId()) ? "-1" : user.getUserId();
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
- if (StringUtils.isNotNull(info) && !info.getUserId().equals(userId))
- {
+ if (StringUtils.isNotNull(info) && !info.getUserId().equals(userId)) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -202,12 +263,10 @@
* @return
*/
@Override
- public String checkEmailUnique(SysUser user)
- {
+ public String checkEmailUnique(SysUser user) {
String userId = StringUtils.isNull(user.getUserId()) ? "-1" : user.getUserId();
SysUser info = userMapper.checkEmailUnique(user.getEmail());
- if (StringUtils.isNotNull(info) && !info.getUserId().equals(userId))
- {
+ if (StringUtils.isNotNull(info) && !info.getUserId().equals(userId)) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -215,33 +274,28 @@
/**
* 鏍￠獙鐢ㄦ埛鏄惁鍏佽鎿嶄綔
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
*/
@Override
- public void checkUserAllowed(SysUser user)
- {
- if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
- {
+ public void checkUserAllowed(SysUser user) {
+ if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
throw new ServiceException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳鐢ㄦ埛");
}
}
/**
* 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄�
- *
+ *
* @param userId 鐢ㄦ埛id
*/
@Override
- public void checkUserDataScope(String userId)
- {
- if (!SysUser.isAdmin(SecurityUtils.getUserId()))
- {
+ public void checkUserDataScope(String userId) {
+ if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
SysUser user = new SysUser();
user.setUserId(userId);
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
- if (StringUtils.isEmpty(users))
- {
+ if (StringUtils.isEmpty(users)) {
throw new ServiceException("娌℃湁鏉冮檺璁块棶鐢ㄦ埛鏁版嵁锛�");
}
}
@@ -249,46 +303,55 @@
/**
* 鏂板淇濆瓨鐢ㄦ埛淇℃伅
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
@Override
@Transactional
- public int insertUser(SysUser user)
- {
+ public int insertUser(SysUser user) {
+
// 鏂板鐢ㄦ埛淇℃伅
+ user.setUserId(IdUtils.simpleUUID());
int rows = userMapper.insertUser(user);
+ if (rows > 0) { //澧炲姞鐢ㄦ埛缂撳瓨
+ redisCache.setCacheObject(getCacheKey(user.getUserId()), user);
+ }
// 鏂板鐢ㄦ埛宀椾綅鍏宠仈
insertUserPost(user);
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
insertUserRole(user);
+ // 鏂板鐢ㄦ埛涓庢姤璀︾被鍨嬪叧鑱�
+ insertAlarmTypeConfig(user);
return rows;
}
/**
* 娉ㄥ唽鐢ㄦ埛淇℃伅
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
@Override
- public boolean registerUser(SysUser user)
- {
+ public boolean registerUser(SysUser user) {
return userMapper.insertUser(user) > 0;
}
/**
* 淇敼淇濆瓨鐢ㄦ埛淇℃伅
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
@Override
@Transactional
- public int updateUser(SysUser user)
- {
+ public int updateUser(SysUser user) {
String userId = user.getUserId();
+ // 鍒犻櫎鐢ㄦ埛涓庢姤璀︾被鍨嬪叧鑱�
+ ardAlarmTypeConfigMapper.deleteArdAlarmTypeConfigByUserId(userId);
+ // 鏂板鐢ㄦ埛涓庢姤璀︾被鍨嬪叧鑱�
+ insertAlarmTypeConfig(user);
+
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
userRoleMapper.deleteUserRoleByUserId(userId);
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
@@ -297,109 +360,116 @@
userPostMapper.deleteUserPostByUserId(userId);
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
insertUserPost(user);
- return userMapper.updateUser(user);
+ //缂撳瓨鐢ㄦ埛
+ SysUser temp = userMapper.selectUserById(user.getUserId());
+ if (!StringUtils.equals(temp.getUserName(), user.getUserName())) {
+ redisCache.deleteObject(getCacheKey(temp.getUserId()));
+ }
+
+ int row = userMapper.updateUser(user);
+ if (row > 0) {
+ redisCache.setCacheObject(getCacheKey(user.getUserId()), temp);
+ }
+ return row;
}
/**
* 鐢ㄦ埛鎺堟潈瑙掕壊
- *
- * @param userId 鐢ㄦ埛ID
+ *
+ * @param userId 鐢ㄦ埛ID
* @param roleIds 瑙掕壊缁�
*/
@Override
@Transactional
- public void insertUserAuth(String userId, Long[] roleIds)
- {
+ public void insertUserAuth(String userId, Long[] roleIds) {
userRoleMapper.deleteUserRoleByUserId(userId);
insertUserRole(userId, roleIds);
}
/**
* 淇敼鐢ㄦ埛鐘舵��
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
@Override
- public int updateUserStatus(SysUser user)
- {
+ public int updateUserStatus(SysUser user) {
return userMapper.updateUser(user);
}
/**
* 淇敼鐢ㄦ埛鍩烘湰淇℃伅
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
@Override
- public int updateUserProfile(SysUser user)
- {
+ public int updateUserProfile(SysUser user) {
return userMapper.updateUser(user);
}
/**
* 淇敼鐢ㄦ埛澶村儚
- *
+ *
* @param userName 鐢ㄦ埛鍚�
- * @param avatar 澶村儚鍦板潃
+ * @param avatar 澶村儚鍦板潃
* @return 缁撴灉
*/
@Override
- public boolean updateUserAvatar(String userName, String avatar)
- {
+ public boolean updateUserAvatar(String userName, String avatar) {
return userMapper.updateUserAvatar(userName, avatar) > 0;
}
/**
* 閲嶇疆鐢ㄦ埛瀵嗙爜
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
@Override
- public int resetPwd(SysUser user)
- {
+ public int resetPwd(SysUser user) {
return userMapper.updateUser(user);
}
/**
* 閲嶇疆鐢ㄦ埛瀵嗙爜
- *
+ *
* @param userName 鐢ㄦ埛鍚�
* @param password 瀵嗙爜
* @return 缁撴灉
*/
@Override
- public int resetUserPwd(String userName, String password)
- {
+ public int resetUserPwd(String userName, String password) {
return userMapper.resetUserPwd(userName, password);
}
/**
* 鏂板鐢ㄦ埛瑙掕壊淇℃伅
- *
+ *
* @param user 鐢ㄦ埛瀵硅薄
*/
- public void insertUserRole(SysUser user)
- {
+ public void insertUserRole(SysUser user) {
this.insertUserRole(user.getUserId(), user.getRoleIds());
}
-
/**
- * 鏂板鐢ㄦ埛宀椾綅淇℃伅
- *
+ * 鏂板鐢ㄦ埛鎶ヨ绫诲瀷淇℃伅
+ *
* @param user 鐢ㄦ埛瀵硅薄
*/
- public void insertUserPost(SysUser user)
- {
+ public void insertAlarmTypeConfig(SysUser user) {
+ this.insertAlarmTypeConfig(user.getUserId(), user.getCommands());
+ }
+ /**
+ * 鏂板鐢ㄦ埛宀椾綅淇℃伅
+ *
+ * @param user 鐢ㄦ埛瀵硅薄
+ */
+ public void insertUserPost(SysUser user) {
Long[] posts = user.getPostIds();
- if (StringUtils.isNotEmpty(posts))
- {
+ if (StringUtils.isNotEmpty(posts)) {
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
- for (Long postId : posts)
- {
+ for (Long postId : posts) {
SysUserPost up = new SysUserPost();
up.setUserId(user.getUserId());
up.setPostId(postId);
@@ -411,18 +481,15 @@
/**
* 鏂板鐢ㄦ埛瑙掕壊淇℃伅
- *
- * @param userId 鐢ㄦ埛ID
+ *
+ * @param userId 鐢ㄦ埛ID
* @param roleIds 瑙掕壊缁�
*/
- public void insertUserRole(String userId, Long[] roleIds)
- {
- if (StringUtils.isNotEmpty(roleIds))
- {
+ public void insertUserRole(String userId, Long[] roleIds) {
+ if (StringUtils.isNotEmpty(roleIds)) {
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
- for (Long roleId : roleIds)
- {
+ for (Long roleId : roleIds) {
SysUserRole ur = new SysUserRole();
ur.setUserId(userId);
ur.setRoleId(roleId);
@@ -431,59 +498,84 @@
userRoleMapper.batchUserRole(list);
}
}
-
+ /**
+ * 鏂板鐢ㄦ埛鎶ヨ绫诲瀷
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @param commands 鎶ヨ绫诲瀷缁�
+ */
+ public void insertAlarmTypeConfig(String userId, List<String> commands) {
+ if (StringUtils.isNotEmpty(commands)) {
+ // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
+ List<ArdAlarmTypeConfig> list = new ArrayList<ArdAlarmTypeConfig>(commands.size());
+ for (String command : commands) {
+ ArdAlarmTypeConfig ur = new ArdAlarmTypeConfig();
+ ur.setUserId(userId);
+ ur.setCommand(command);
+ String alarm_type = DictUtils.getDictLabel("alarm_type", command);
+ ur.setAlarmType(alarm_type);
+ list.add(ur);
+ }
+ ardAlarmTypeConfigMapper.batchAlarmTypeConfig(list);
+ }
+ }
/**
* 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛
- *
+ *
* @param userId 鐢ㄦ埛ID
* @return 缁撴灉
*/
@Override
@Transactional
- public int deleteUserById(String userId)
- {
+ public int deleteUserById(String userId) {
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
userRoleMapper.deleteUserRoleByUserId(userId);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
userPostMapper.deleteUserPostByUserId(userId);
- return userMapper.deleteUserById(userId);
+ int rows = userMapper.deleteUserById(userId);
+ if (rows > 0) {
+ redisCache.deleteObject(getCacheKey(userId));
+ }
+ return rows;
}
/**
* 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
- *
+ *
* @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
* @return 缁撴灉
*/
@Override
@Transactional
- public int deleteUserByIds(String[] userIds)
- {
- for (String userId : userIds)
- {
+ public int deleteUserByIds(String[] userIds) {
+ for (String userId : userIds) {
checkUserAllowed(new SysUser(userId));
checkUserDataScope(userId);
}
+ // 鍒犻櫎鐢ㄦ埛涓庢姤璀︾被鍨嬪叧鑱�
+ ardAlarmTypeConfigMapper.deleteArdAlarmTypeConfigByIds(userIds);
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
userRoleMapper.deleteUserRole(userIds);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
userPostMapper.deleteUserPost(userIds);
- return userMapper.deleteUserByIds(userIds);
+ int rows = userMapper.deleteUserByIds(userIds);
+ if (rows > 0) {
+ clearUserCache(userIds);
+ }
+ return rows;
}
/**
* 瀵煎叆鐢ㄦ埛鏁版嵁
- *
- * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃
+ *
+ * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃
* @param isUpdateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁
- * @param operName 鎿嶄綔鐢ㄦ埛
+ * @param operName 鎿嶄綔鐢ㄦ埛
* @return 缁撴灉
*/
@Override
- public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
- {
- if (StringUtils.isNull(userList) || userList.size() == 0)
- {
+ public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
+ if (StringUtils.isNull(userList) || userList.size() == 0) {
throw new ServiceException("瀵煎叆鐢ㄦ埛鏁版嵁涓嶈兘涓虹┖锛�");
}
int successNum = 0;
@@ -491,23 +583,18 @@
StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder();
String password = configService.selectConfigByKey("sys.user.initPassword");
- for (SysUser user : userList)
- {
- try
- {
+ for (SysUser user : userList) {
+ try {
// 楠岃瘉鏄惁瀛樺湪杩欎釜鐢ㄦ埛
SysUser u = userMapper.selectUserByUserName(user.getUserName());
- if (StringUtils.isNull(u))
- {
+ if (StringUtils.isNull(u)) {
BeanValidators.validateWithException(validator, user);
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()==null?password:user.getPassword()));
+ user.setPassword(SecurityUtils.encryptPassword(user.getPassword() == null ? password : user.getPassword()));
user.setCreateBy(operName);
this.insertUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆鎴愬姛");
- }
- else if (isUpdateSupport)
- {
+ } else if (isUpdateSupport) {
BeanValidators.validateWithException(validator, user);
checkUserAllowed(user);
checkUserDataScope(user.getUserId());
@@ -515,30 +602,49 @@
this.updateUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 鏇存柊鎴愬姛");
- }
- else
- {
+ } else {
failureNum++;
failureMsg.append("<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 宸插瓨鍦�");
}
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
failureNum++;
String msg = "<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆澶辫触锛�";
failureMsg.append(msg + e.getMessage());
log.error(msg, e);
}
}
- if (failureNum > 0)
- {
+ if (failureNum > 0) {
failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝ｇ‘锛岄敊璇涓嬶細");
throw new ServiceException(failureMsg.toString());
- }
- else
- {
+ } else {
successMsg.insert(0, "鎭枩鎮紝鏁版嵁宸插叏閮ㄥ鍏ユ垚鍔燂紒鍏� " + successNum + " 鏉★紝鏁版嵁濡備笅锛�");
}
return successMsg.toString();
}
+
+ /**
+ * 鑾峰彇cache key
+ *
+ * @param configKey 鍙傛暟閿�
+ * @return 缂撳瓨閿甼ey
+ */
+ private String getCacheKey(String configKey) {
+ return CacheConstants.USER_LIST_KEY + configKey;
+ }
+
+
+ @Override
+ public List<SysUser> userByDeptList(List<Long> deptList) {
+ QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("dept_id",deptList);
+ return userMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public List<SysUser> userByDept(Long deptId) {
+ QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("dept_id",deptId).eq("del_flag","0").eq("app_user_type","1");
+ return userMapper.selectList(queryWrapper);
+ }
+
}
--
Gitblit v1.9.3