From cbd1621935bc94b850b968738eccfa4fcc31efdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Mon, 24 Apr 2023 08:03:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=95=B0=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

---
 .../sample/DynamicDataSourceSample.java       | 41 +++++++++++++++++++
 .../youlai/system/service/SysDictService.java |  9 ++++
 .../service/impl/SysDictServiceImpl.java      | 19 +++++++++
 .../youlai/system/DynamicDataSourceTest.java  | 27 +++---------
 4 files changed, 75 insertions(+), 21 deletions(-)
 create mode 100644 src/main/java/com/youlai/system/sample/DynamicDataSourceSample.java

diff --git a/src/main/java/com/youlai/system/sample/DynamicDataSourceSample.java b/src/main/java/com/youlai/system/sample/DynamicDataSourceSample.java
new file mode 100644
index 00000000..64854113
--- /dev/null
+++ b/src/main/java/com/youlai/system/sample/DynamicDataSourceSample.java
@@ -0,0 +1,41 @@
+package com.youlai.system.sample;
+
+import cn.hutool.core.util.RandomUtil;
+import com.youlai.system.pojo.entity.SysDictType;
+import com.youlai.system.service.SysDictService;
+import com.youlai.system.service.SysDictTypeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 动态数据源案例
+ *
+ * @author haoxr
+ * @date 2023/4/24
+ */
+@Component
+@RequiredArgsConstructor
+public class DynamicDataSourceSample {
+
+    private final SysDictTypeService dictTypeService;
+
+    private final SysDictService dictService;
+
+
+    @Transactional
+    public boolean updateDictTypeCode(Long dictTypeId,String newTypeCode) {
+
+        SysDictType dictType = dictTypeService.getById(dictTypeId);
+        String originalTypeCode = dictType.getCode();
+        dictType.setCode(newTypeCode);
+        boolean result = dictTypeService.updateById(dictType);
+
+        if (result) {
+            result = dictService.updateDictTypeCode(originalTypeCode, newTypeCode);
+        }
+        return result;
+    }
+
+
+}
diff --git a/src/main/java/com/youlai/system/service/SysDictService.java b/src/main/java/com/youlai/system/service/SysDictService.java
index 22bb7109..30811108 100644
--- a/src/main/java/com/youlai/system/service/SysDictService.java
+++ b/src/main/java/com/youlai/system/service/SysDictService.java
@@ -65,4 +65,13 @@ public interface SysDictService extends IService<SysDict> {
      * @return
      */
     List<Option> listDictOptions(String typeCode);
+
+    /**
+     * 修改字典类型编码
+     *
+     * @param originalTypeCode
+     * @param newTypeCode
+     * @return
+     */
+    boolean updateDictTypeCode(String originalTypeCode, String newTypeCode);
 }
diff --git a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
index 1627febb..96c1497c 100644
--- a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
@@ -3,7 +3,9 @@ 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;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.system.converter.DictConverter;
@@ -159,6 +161,23 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         return options;
     }
 
+    /**
+     * 修改字典类型编码(多数据源测试)
+     *
+     * @param originalTypeCode
+     * @param newTypeCode
+     * @return
+     */
+    @DS("slave")
+    @Override
+    public boolean updateDictTypeCode(String originalTypeCode, String newTypeCode) {
+        boolean result = this.update(new LambdaUpdateWrapper<SysDict>()
+                .eq(SysDict::getTypeCode, originalTypeCode)
+                .set(SysDict::getTypeCode, newTypeCode)
+        );
+        return result;
+    }
+
 }
 
 
diff --git a/src/test/java/com/youlai/system/DynamicDataSourceTest.java b/src/test/java/com/youlai/system/DynamicDataSourceTest.java
index e3914552..0248a86d 100644
--- a/src/test/java/com/youlai/system/DynamicDataSourceTest.java
+++ b/src/test/java/com/youlai/system/DynamicDataSourceTest.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.RandomUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.youlai.system.pojo.form.RoleForm;
 import com.youlai.system.pojo.form.UserForm;
+import com.youlai.system.sample.DynamicDataSourceSample;
 import com.youlai.system.service.SysRoleService;
 import com.youlai.system.service.SysUserService;
 import lombok.extern.slf4j.Slf4j;
@@ -17,29 +18,13 @@ import org.springframework.transaction.annotation.Transactional;
 class DynamicDataSourceTest {
 
     @Autowired
-    private SysUserService userService;
+    private DynamicDataSourceSample dynamicDataSourceSample;
 
-    @Autowired
-    private SysRoleService roleService;
-
-    private static Long userId = 3L; // 测试用户
-    private static Long roleId = 3L;
 
     @Test
-    @Transactional
-    void updateUser() {
-        UserForm userForm = userService.getUserFormData(userId);
-        userForm.setNickname("测试用户_" + RandomUtil.randomString(RandomUtil.BASE_CHAR, 1));
-        userService.updateUser(userId, userForm);
-
-        this.updateRole();
-    }
-
-
-    @DS("slave")
-    void updateRole() {
-        RoleForm roleForm = roleService.getRoleForm(roleId);
-        roleForm.setName("访问游客_" + RandomUtil.randomString(RandomUtil.BASE_CHAR, 1));
-        roleService.saveRole(roleForm);
+    void testDynamicDataSourceWithTransactional() {
+        String newTypeCod = RandomUtil.randomString(RandomUtil.BASE_CHAR, 6).toUpperCase();
+        boolean result = dynamicDataSourceSample.updateDictTypeCode(2L, newTypeCod);
+        log.info("testDynamicDataSourceWithTransactional result:{}", result);
     }
 }
\ No newline at end of file