diff --git a/src/main/java/com/youlai/system/sample/DynamicDataSourceSample.java b/src/main/java/com/youlai/system/sample/DynamicDataSourceSample.java index 64854113..c5a418f2 100644 --- a/src/main/java/com/youlai/system/sample/DynamicDataSourceSample.java +++ b/src/main/java/com/youlai/system/sample/DynamicDataSourceSample.java @@ -24,7 +24,7 @@ public class DynamicDataSourceSample { @Transactional - public boolean updateDictTypeCode(Long dictTypeId,String newTypeCode) { + public boolean updateMaster(Long dictTypeId,String newTypeCode) { SysDictType dictType = dictTypeService.getById(dictTypeId); String originalTypeCode = dictType.getCode(); @@ -32,7 +32,7 @@ public class DynamicDataSourceSample { boolean result = dictTypeService.updateById(dictType); if (result) { - result = dictService.updateDictTypeCode(originalTypeCode, newTypeCode); + result = dictService.updateSlave(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 30811108..f3f2f3b2 100644 --- a/src/main/java/com/youlai/system/service/SysDictService.java +++ b/src/main/java/com/youlai/system/service/SysDictService.java @@ -73,5 +73,5 @@ public interface SysDictService extends IService { * @param newTypeCode * @return */ - boolean updateDictTypeCode(String originalTypeCode, String newTypeCode); + boolean updateSlave(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 96c1497c..20a0faad 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java @@ -170,7 +170,7 @@ public class SysDictServiceImpl extends ServiceImpl impl */ @DS("slave") @Override - public boolean updateDictTypeCode(String originalTypeCode, String newTypeCode) { + public boolean updateSlave(String originalTypeCode, String newTypeCode) { boolean result = this.update(new LambdaUpdateWrapper() .eq(SysDict::getTypeCode, originalTypeCode) .set(SysDict::getTypeCode, newTypeCode) diff --git a/src/test/java/com/youlai/system/DynamicDataSourceTest.java b/src/test/java/com/youlai/system/DynamicDataSourceTest.java index 0248a86d..1d665d6b 100644 --- a/src/test/java/com/youlai/system/DynamicDataSourceTest.java +++ b/src/test/java/com/youlai/system/DynamicDataSourceTest.java @@ -1,17 +1,11 @@ package com.youlai.system; 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; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.transaction.annotation.Transactional; @SpringBootTest @Slf4j @@ -24,7 +18,7 @@ class DynamicDataSourceTest { @Test void testDynamicDataSourceWithTransactional() { String newTypeCod = RandomUtil.randomString(RandomUtil.BASE_CHAR, 6).toUpperCase(); - boolean result = dynamicDataSourceSample.updateDictTypeCode(2L, newTypeCod); + boolean result = dynamicDataSourceSample.updateMaster(2L, newTypeCod); log.info("testDynamicDataSourceWithTransactional result:{}", result); } } \ No newline at end of file