From 042936ba89e122bece0e4ce595c68f859b9e9bed Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 17 四月 2024 17:53:43 +0800
Subject: [PATCH] 工单下发：新增互斥锁、下发记录
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 53a6c0a..a362ac8 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,19 @@
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.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 +48,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,6 +64,14 @@
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());
@@ -73,7 +89,7 @@
*/
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);
@@ -119,7 +135,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("鍒犻櫎鎴愬姛");
}
@@ -198,4 +217,12 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ @Override
+ public Result getPeopleByUnitId(String id) {
+ List<YwPeople> entities = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(YwPeople::getBelongUnit, id)
+ .list();
+ return Result.ok().data(entities);
+ }
}
--
Gitblit v1.8.0