From fe4809c25687703838a47e1771c0a44845fa8b9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Sun, 23 Apr 2023 07:48:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E@Transaction=E5=92=8C?=
 =?UTF-8?q?@DS=E5=90=8C=E6=97=B6=E4=BD=BF=E7=94=A8=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=8A=A8=E6=80=81=E5=88=87=E6=8D=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysRoleServiceImpl.java      |  2 ++
 .../service/impl/SysUserServiceImpl.java      |  5 +++
 .../service/impl/SysUserServiceImplTest.java  | 32 +++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 src/test/java/com/youlai/system/service/impl/SysUserServiceImplTest.java

diff --git a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
index 2e51da2f..b06c7047 100644
--- a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
@@ -3,6 +3,7 @@ package com.youlai.system.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -99,6 +100,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
      * @return
      */
     @Override
+    //@DS("slave")
     public boolean saveRole(RoleForm roleForm) {
 
         Long roleId = roleForm.getId();
diff --git a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
index 6276c35c..bb565abb 100644
--- a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
@@ -2,6 +2,7 @@ package com.youlai.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -16,6 +17,7 @@ import com.youlai.system.pojo.bo.UserAuthInfo;
 import com.youlai.system.pojo.bo.UserBO;
 import com.youlai.system.pojo.bo.UserFormBO;
 import com.youlai.system.pojo.entity.SysUser;
+import com.youlai.system.pojo.form.RoleForm;
 import com.youlai.system.pojo.form.UserForm;
 import com.youlai.system.pojo.query.UserPageQuery;
 import com.youlai.system.pojo.vo.UserExportVO;
@@ -152,6 +154,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         boolean result = this.updateById(entity);
 
         if (result) {
+         /*   RoleForm roleForm = roleService.getRoleForm(12l);
+            roleForm.setName("测试角色_" + RandomUtil.randomString(RandomUtil.BASE_CHAR, 1));
+            roleService.saveRole(roleForm);*/
             // 保存用户角色
             userRoleService.saveUserRoles(entity.getId(), userForm.getRoleIds());
         }
diff --git a/src/test/java/com/youlai/system/service/impl/SysUserServiceImplTest.java b/src/test/java/com/youlai/system/service/impl/SysUserServiceImplTest.java
new file mode 100644
index 00000000..a4f7ef12
--- /dev/null
+++ b/src/test/java/com/youlai/system/service/impl/SysUserServiceImplTest.java
@@ -0,0 +1,32 @@
+package com.youlai.system.service.impl;
+
+import cn.hutool.core.util.RandomUtil;
+import com.youlai.system.converter.UserConverter;
+import com.youlai.system.pojo.entity.SysUser;
+import com.youlai.system.pojo.form.UserForm;
+import com.youlai.system.service.SysUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+@Slf4j
+class SysUserServiceImplTest {
+
+    @Autowired
+    private SysUserService userService;
+    @Autowired
+    private UserConverter userConverter;
+
+    @Test
+    void updateUser() {
+        Long userId = 3L;
+        SysUser entity = userService.getById(userId);
+        UserForm userForm = userConverter.entity2Form(entity);
+        String nickname = "测试小用户_" + RandomUtil.randomString(RandomUtil.BASE_CHAR, 1);
+        userForm.setNickname(nickname);
+
+        userService.updateUser(userId, userForm);
+    }
+}
\ No newline at end of file