From cc5438a25896d19f02b652865781dc443b274354 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 28 十月 2026 14:26:23 +0800
Subject: [PATCH] feat(hrm): 员工档案与系统账号双向同步
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java | 136 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 125 insertions(+), 11 deletions(-)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
index 84e3bb6..1098246 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
@@ -20,11 +20,15 @@
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportRespVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserSyncReqDTO;
+import cn.iocoder.yudao.module.system.api.user.event.AdminUserDeletedEvent;
+import cn.iocoder.yudao.module.system.api.user.event.AdminUserUpdatedEvent;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.UserPostDO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.dal.mysql.dept.UserPostMapper;
import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
+import cn.iocoder.yudao.module.system.mq.producer.user.AdminUserProducer;
import cn.iocoder.yudao.module.system.service.dept.DeptService;
import cn.iocoder.yudao.module.system.service.dept.PostService;
import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService;
@@ -37,6 +41,7 @@
import jakarta.annotation.Resource;
import jakarta.validation.ConstraintViolationException;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
@@ -54,7 +59,7 @@
/**
* 鍚庡彴鐢ㄦ埛 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service("adminUserService")
@Slf4j
@@ -88,6 +93,12 @@
@Resource
private ConfigApi configApi;
+ @Resource
+ private AdminUserProducer adminUserProducer;
+
+ @Resource
+ private ApplicationEventPublisher eventPublisher;
+
@Override
@Transactional(rollbackFor = Exception.class)
@LogRecord(type = SYSTEM_USER_TYPE, subType = SYSTEM_USER_CREATE_SUB_TYPE, bizNo = "{{#user.id}}",
@@ -112,6 +123,10 @@
if (CollectionUtil.isNotEmpty(user.getPostIds())) {
userPostMapper.insertBatch(convertList(user.getPostIds(),
postId -> new UserPostDO().setUserId(user.getId()).setPostId(postId)));
+ }
+ // 2.3 鍒嗛厤鐢ㄦ埛瑙掕壊
+ if (CollUtil.isNotEmpty(createReqVO.getRoleIds())) {
+ permissionService.assignUserRole(user.getId(), createReqVO.getRoleIds());
}
// 3. 璁板綍鎿嶄綔鏃ュ織涓婁笅鏂�
@@ -158,10 +173,17 @@
userMapper.updateById(updateObj);
// 2.2 鏇存柊宀椾綅
updateUserPost(updateReqVO, updateObj);
+ // 2.3 鏄电О / 澶村儚鍙樺寲鏃讹紝鍙戦�佹秷鎭緵涓嬫父璁㈤槄锛堝 IM 妯″潡鎺� FRIEND_INFO_UPDATED锛�
+ publishUserProfileUpdatedIfChanged(oldUser, updateReqVO.getNickname(), updateReqVO.getAvatar());
// 3. 璁板綍鎿嶄綔鏃ュ織涓婁笅鏂�
LogRecordContext.putVariable(DiffParseFunction.OLD_OBJECT, BeanUtils.toBean(oldUser, UserSaveReqVO.class));
LogRecordContext.putVariable("user", oldUser);
+
+ // 4. 閫氱煡 hrm 妯″潡鍚屾鍛樺伐妗ｆ锛堟病鏈夊憳宸ユ。妗堢殑璐﹀彿浼氳鐩戝惉鍣ㄧ洿鎺ヨ烦杩囷級
+ eventPublisher.publishEvent(new AdminUserUpdatedEvent(updateReqVO.getId(),
+ updateReqVO.getNickname(), updateReqVO.getMobile(), updateReqVO.getDeptId(),
+ updateReqVO.getSex(), updateReqVO.getEmail()));
}
private void updateUserPost(UserSaveReqVO reqVO, AdminUserDO updateObj) {
@@ -187,13 +209,36 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void updateUserProfile(Long id, UserProfileUpdateReqVO reqVO) {
- // 鏍￠獙姝ｇ‘鎬�
- validateUserExists(id);
+ // 1. 鏍￠獙姝ｇ‘鎬�
+ AdminUserDO oldUser = validateUserExists(id);
validateEmailUnique(id, reqVO.getEmail());
validateMobileUnique(id, reqVO.getMobile());
- // 鎵ц鏇存柊
+
+ // 2. 鎵ц鏇存柊
userMapper.updateById(BeanUtils.toBean(reqVO, AdminUserDO.class).setId(id));
+
+ // 3. 鏄电О / 澶村儚鍙樺寲鏃讹紝鍙戦�佹秷鎭緵涓嬫父璁㈤槄锛堝 IM 妯″潡鎺� FRIEND_INFO_UPDATED锛�
+ publishUserProfileUpdatedIfChanged(oldUser, reqVO.getNickname(), reqVO.getAvatar());
+
+ // 4. 閫氱煡 hrm 妯″潡鍚屾鍛樺伐妗ｆ锛堟病鏈夊憳宸ユ。妗堢殑璐﹀彿浼氳鐩戝惉鍣ㄧ洿鎺ヨ烦杩囷級
+ eventPublisher.publishEvent(new AdminUserUpdatedEvent(id,
+ reqVO.getNickname(), reqVO.getMobile(), null, reqVO.getSex(), reqVO.getEmail()));
+ }
+
+ /**
+ * 浠呭綋 nickname 鎴� avatar 璺熸棫鍊间笉涓�鑷存椂锛屽彂閫� AdminUserProfileUpdateMessage
+ */
+ private void publishUserProfileUpdatedIfChanged(AdminUserDO oldUser, String newNickname, String newAvatar) {
+ boolean nicknameChanged = newNickname != null && !ObjUtil.equal(oldUser.getNickname(), newNickname);
+ boolean avatarChanged = newAvatar != null && !ObjUtil.equal(oldUser.getAvatar(), newAvatar);
+ if (!nicknameChanged && !avatarChanged) {
+ return;
+ }
+ adminUserProducer.sendUserProfileUpdateMessage(oldUser.getId(),
+ nicknameChanged ? newNickname : null,
+ avatarChanged ? newAvatar : null);
}
@Override
@@ -245,6 +290,18 @@
@LogRecord(type = SYSTEM_USER_TYPE, subType = SYSTEM_USER_DELETE_SUB_TYPE, bizNo = "{{#id}}",
success = SYSTEM_USER_DELETE_SUCCESS)
public void deleteUser(Long id) {
+ doDeleteUser(id);
+ // 閫氱煡 hrm 妯″潡鑱斿姩鍒犻櫎鍛樺伐妗ｆ锛堟病鏈夊憳宸ユ。妗堢殑璐﹀彿浼氳鐩戝惉鍣ㄧ洿鎺ヨ烦杩囷級
+ eventPublisher.publishEvent(new AdminUserDeletedEvent(id));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteUserSilently(Long id) {
+ doDeleteUser(id);
+ }
+
+ private void doDeleteUser(Long id) {
// 1. 鏍￠獙鐢ㄦ埛瀛樺湪
AdminUserDO user = validateUserExists(id);
@@ -270,6 +327,44 @@
permissionService.processUserDeleted(id);
userPostMapper.deleteByUserId(id);
});
+
+ // 3. 閫氱煡 hrm 妯″潡鑱斿姩鍒犻櫎鍛樺伐妗ｆ
+ ids.forEach(id -> eventPublisher.publishEvent(new AdminUserDeletedEvent(id)));
+ }
+
+ @Override
+ public void updateUserForEmployee(AdminUserSyncReqDTO reqDTO) {
+ if (reqDTO == null || reqDTO.getUserId() == null) {
+ return;
+ }
+ // 1. 鏍￠獙鐢ㄦ埛瀛樺湪
+ AdminUserDO user = validateUserExists(reqDTO.getUserId());
+ // 2. 鏍￠獙鎵嬫満鍙� / 閭鍞竴锛堜笌鏃у�间笉鍚屾椂鎵嶆牎楠岋級
+ if (StrUtil.isNotBlank(reqDTO.getMobile()) && !ObjUtil.equal(user.getMobile(), reqDTO.getMobile())) {
+ validateMobileUnique(reqDTO.getUserId(), reqDTO.getMobile());
+ }
+ if (StrUtil.isNotBlank(reqDTO.getEmail()) && !ObjUtil.equal(user.getEmail(), reqDTO.getEmail())) {
+ validateEmailUnique(reqDTO.getUserId(), reqDTO.getEmail());
+ }
+ // 3. 鍙洿鏂伴潪绌哄瓧娈�
+ AdminUserDO updateObj = new AdminUserDO();
+ updateObj.setId(reqDTO.getUserId());
+ if (StrUtil.isNotBlank(reqDTO.getNickname())) {
+ updateObj.setNickname(reqDTO.getNickname());
+ }
+ if (StrUtil.isNotBlank(reqDTO.getMobile())) {
+ updateObj.setMobile(reqDTO.getMobile());
+ }
+ if (reqDTO.getDeptId() != null) {
+ updateObj.setDeptId(reqDTO.getDeptId());
+ }
+ if (reqDTO.getSex() != null) {
+ updateObj.setSex(reqDTO.getSex());
+ }
+ if (StrUtil.isNotBlank(reqDTO.getEmail())) {
+ updateObj.setEmail(reqDTO.getEmail());
+ }
+ userMapper.updateById(updateObj);
}
@Override
@@ -329,6 +424,11 @@
}
return userMapper.selectByIds(ids);
}
+
+ public List<AdminUserDO> getUserListAll() {
+ return userMapper.selectList();
+ }
+
@Override
public void validateUserList(Collection<Long> ids) {
@@ -479,11 +579,8 @@
if (CollUtil.isEmpty(importUsers)) {
throw exception(USER_IMPORT_LIST_IS_EMPTY);
}
- // 1.2 鍒濆鍖栧瘑鐮佷笉鑳戒负绌�
+ // 1.2 绯荤粺鍙傛暟涓殑鍒濆瀵嗙爜锛屼綔涓� Excel 鏈～鍐欏瘑鐮佹椂鐨勫厹搴�
String initPassword = configApi.getConfigValueByKey(USER_INIT_PASSWORD_KEY);
- if (StrUtil.isEmpty(initPassword)) {
- throw exception(USER_IMPORT_INIT_PASSWORD);
- }
// 2. 閬嶅巻锛岄�愪釜鍒涘缓 or 鏇存柊
UserImportRespVO respVO = UserImportRespVO.builder().createUsernames(new ArrayList<>())
@@ -491,11 +588,20 @@
AtomicInteger index = new AtomicInteger(1);
importUsers.forEach(importUser -> {
int currentIndex = index.getAndIncrement();
+ String key = StrUtil.blankToDefault(importUser.getUsername(), "绗� " + currentIndex + " 琛�");
+ // 2.1.0 瑙ｆ瀽璇ヨ鍒濆瀵嗙爜锛欵xcel 濉啓浜嗗氨鐢ㄥ～鍐欑殑锛屽惁鍒欒鍙栫郴缁熷弬鏁�
+ String effectivePassword = StrUtil.isNotBlank(importUser.getPassword())
+ ? importUser.getPassword() : initPassword;
+ if (StrUtil.isBlank(effectivePassword)) {
+ respVO.getFailureUsernames().put(key,
+ "鏈～鍐欏垵濮嬪瘑鐮侊紝涓旂郴缁熷弬鏁� system.user.init-password 鏈厤缃��"
+ + "璇峰湪 Excel 涓～鍐欒琛屽垵濮嬪瘑鐮侊紝鎴栧厛鍦ㄥ弬鏁拌缃腑閰嶇疆 system.user.init-password");
+ return;
+ }
// 2.1.1 鏍￠獙瀛楁鏄惁绗﹀悎瑕佹眰
try {
- ValidationUtils.validate(BeanUtils.toBean(importUser, UserSaveReqVO.class).setPassword(initPassword));
+ ValidationUtils.validate(BeanUtils.toBean(importUser, UserSaveReqVO.class).setPassword(effectivePassword));
} catch (ConstraintViolationException ex) {
- String key = StrUtil.blankToDefault(importUser.getUsername(), "绗� " + currentIndex + " 琛�");
respVO.getFailureUsernames().put(key, ex.getMessage());
return;
}
@@ -512,7 +618,7 @@
AdminUserDO existUser = userMapper.selectByUsername(importUser.getUsername());
if (existUser == null) {
userMapper.insert(BeanUtils.toBean(importUser, AdminUserDO.class)
- .setPassword(encodePassword(initPassword)).setPostIds(new HashSet<>())); // 璁剧疆榛樿瀵嗙爜鍙婄┖宀椾綅缂栧彿鏁扮粍
+ .setPassword(encodePassword(effectivePassword)).setPostIds(new HashSet<>())); // 璁剧疆鍒濆瀵嗙爜鍙婄┖宀椾綅缂栧彿鏁扮粍
respVO.getCreateUsernames().add(importUser.getUsername());
return;
}
@@ -523,6 +629,9 @@
}
AdminUserDO updateUser = BeanUtils.toBean(importUser, AdminUserDO.class);
updateUser.setId(existUser.getId());
+ // 瀵嗙爜鍗曠嫭澶勭悊锛欵xcel 濉啓浜嗘墠鏇存柊锛涙湭濉啓鍒欑疆绌猴紝淇濇寔鍘熷瘑鐮佷笉鍙橈紙閬垮厤鎶婃槑鏂囧啓杩涘簱锛�
+ updateUser.setPassword(StrUtil.isNotBlank(importUser.getPassword())
+ ? encodePassword(importUser.getPassword()) : null);
userMapper.updateById(updateUser);
respVO.getUpdateUsernames().add(importUser.getUsername());
});
@@ -535,6 +644,11 @@
}
@Override
+ public List<AdminUserDO> getDeptUsers(Collection<Long> deptIds) {
+ return userMapper.selectListByDeptIds(deptIds);
+ }
+
+ @Override
public boolean isPasswordMatch(String rawPassword, String encodedPassword) {
return passwordEncoder.matches(rawPassword, encodedPassword);
}
--
Gitblit v1.9.3