From b14531e3b850fe6d2fa916ba7b88b3e2bd2ff30a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 11 九月 2024 16:47:48 +0800
Subject: [PATCH] OSD加标签
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
index 52a2c6b..1fbfae7 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
@@ -10,12 +10,20 @@
import com.ycl.platform.domain.form.YwPeopleForm;
import com.ycl.platform.domain.vo.YwPeopleVO;
import com.ycl.platform.domain.query.YwPeopleQuery;
+
+import java.util.Collections;
+import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.system.domain.SysUserRole;
+import com.ycl.system.entity.SysRole;
import com.ycl.system.entity.SysUser;
+import com.ycl.system.mapper.SysRoleMapper;
import com.ycl.system.mapper.SysUserMapper;
+import com.ycl.system.mapper.SysUserRoleMapper;
import com.ycl.system.page.PageUtil;
+import com.ycl.utils.SecurityUtils;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
@@ -41,8 +49,9 @@
private final YwPeopleMapper ywPeopleMapper;
private final YwUnitMapper ywUnitMapper;
- private final PasswordEncoder passwordEncoder;
private final SysUserMapper sysUserMapper;
+ private final SysUserRoleMapper sysUserRoleMapper;
+ private final SysRoleMapper sysRoleMapper;
/**
* 娣诲姞
@@ -56,10 +65,21 @@
SysUser sysUser = new SysUser();
fullUser(sysUser, form);
sysUserMapper.insertUser(sysUser);
+ // 鑾峰彇杩愮淮浜哄憳瑙掕壊
+ SysRole sysRole = sysRoleMapper.selectRoleByKey("yw_user");
+ if (Objects.isNull(sysRole)) { return Result.error("杩愮淮瑙掕壊涓嶅瓨鍦�"); }
+ // 缁戝畾璐﹀彿瑙掕壊鍏崇郴
+ SysUserRole sysUserRole = new SysUserRole();
+ sysUserRole.setRoleId(sysRole.getRoleId());
+ sysUserRole.setUserId(sysUser.getUserId());
+ sysUserRoleMapper.batchUserRole(Collections.singletonList(sysUserRole));
YwPeople entity = YwPeopleForm.getEntityByForm(form, null);
entity.setUserId(sysUser.getUserId());
entity.setAddWay("manual");
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -73,9 +93,8 @@
*/
public void fullUser(SysUser sysUser, YwPeopleForm form) {
sysUser.setUserName(form.getYwPersonAccount());
- sysUser.setPassword(passwordEncoder.encode("123456"));
+ sysUser.setPassword(SecurityUtils.encryptPassword("123456"));
sysUser.setStatus("0");
- sysUser.setDelFlag("0");
sysUser.setFirstLogin((short) 0);
sysUser.setNickName(form.getYwPersonName());
}
@@ -99,6 +118,8 @@
sysUserMapper.updateUser(sysUser);
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
if (baseMapper.updateById(entity) > 0) {
return Result.ok("淇敼鎴愬姛");
}
@@ -119,7 +140,10 @@
.list();
List<Long> userIds = list.stream().map(YwPeople::getUserId).collect(Collectors.toList());
baseMapper.deleteBatchIds(ids);
- sysUserMapper.deleteUserByIds((Long[]) userIds.toArray());
+ if (!userIds.isEmpty()) {
+ sysUserRoleMapper.deleteUserRoleByUserIds(userIds);
+ sysUserMapper.deleteUserByIds(userIds.toArray(new Long[0]));
+ }
return Result.ok("鍒犻櫎鎴愬姛");
}
--
Gitblit v1.8.0