From f284c5ef6a1aa6e9ba5d4e94e4b2abe83b6ea18c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 14:54:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java | 81 ++++++++++++++++++++++++++++++++++++----
1 files changed, 73 insertions(+), 8 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 485bc30..549199d 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,23 @@
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;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.Objects;
@@ -37,6 +48,9 @@
private final YwPeopleMapper ywPeopleMapper;
private final YwUnitMapper ywUnitMapper;
+ private final SysUserMapper sysUserMapper;
+ private final SysUserRoleMapper sysUserRoleMapper;
+ private final SysRoleMapper sysRoleMapper;
/**
* 娣诲姞
@@ -44,8 +58,23 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result add(YwPeopleForm form) {
+ // 涓鸿繍缁翠汉鍛樻坊鍔犺处鍙�
+ 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");
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
@@ -54,17 +83,36 @@
}
/**
+ * 璧嬪�紆ser
+ * @param sysUser
+ * @param form
+ */
+ public void fullUser(SysUser sysUser, YwPeopleForm form) {
+ sysUser.setUserName(form.getYwPersonAccount());
+ sysUser.setPassword(SecurityUtils.encryptPassword("123456"));
+ sysUser.setStatus("0");
+ sysUser.setFirstLogin((short) 0);
+ sysUser.setNickName(form.getYwPersonName());
+ }
+
+ /**
* 淇敼
* @param form
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result update(YwPeopleForm form) {
YwPeople entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+
+ SysUser sysUser = sysUserMapper.selectUserById(entity.getUserId());
+ sysUser.setUserName(form.getYwPersonAccount());
+ sysUser.setNickName(form.getYwPersonName());
+ sysUserMapper.updateUser(sysUser);
+
BeanUtils.copyProperties(form, entity);
if (baseMapper.updateById(entity) > 0) {
return Result.ok("淇敼鎴愬姛");
@@ -78,11 +126,19 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result remove(List<String> ids) {
- if(baseMapper.deleteBatchIds(ids) > 0) {
- return Result.ok("鍒犻櫎鎴愬姛");
+ List<YwPeople> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .select(YwPeople::getUserId)
+ .in(YwPeople::getId, ids)
+ .list();
+ List<Long> userIds = list.stream().map(YwPeople::getUserId).collect(Collectors.toList());
+ baseMapper.deleteBatchIds(ids);
+ if (!userIds.isEmpty()) {
+ sysUserRoleMapper.deleteUserRoleByUserIds(userIds);
+ sysUserMapper.deleteUserByIds(userIds.toArray(new Long[0]));
}
- return Result.error("鍒犻櫎澶辫触");
+ return Result.ok("鍒犻櫎鎴愬姛");
}
/**
@@ -91,11 +147,12 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result removeById(String id) {
- if(baseMapper.deleteById(id) > 0) {
- return Result.ok("鍒犻櫎鎴愬姛");
- }
- return Result.error("鍒犻櫎澶辫触");
+ YwPeople ywPeople = baseMapper.selectById(id);
+ sysUserMapper.deleteUserById(ywPeople.getUserId());
+ baseMapper.deleteById(id);
+ return Result.ok("鍒犻櫎鎴愬姛");
}
/**
@@ -159,4 +216,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