From f8ef90ab98ec63fb7a28fddea6963584b6a781c6 Mon Sep 17 00:00:00 2001 From: dingzhongyuan Date: Mon, 21 Jun 2021 17:13:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=B5=8B=E8=AF=95=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/SysDeptServiceImpl.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index ec1c7c2fd..c3ce52266 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -45,10 +45,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Autowired private SysUserMapper userMapper; - //测试当前数据源 - @Autowired - private DataSource dataSource; - /** * 查询部门管理数据 * @@ -58,10 +54,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override @DataScope(deptAlias = "d") public List selectDeptList(SysDept dept) { - DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource; - DataSource datasource=ds.determineDataSource(); - String dataName = DynamicDataSourceContextHolder.peek(); - log.info("--查询部门管理数据---当前数据源名称:"+dataName); return baseMapper.selectDeptList(dept); } @@ -125,10 +117,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override @DS("slave") public SysDept selectDeptById(Long deptId) { - DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource; - DataSource datasource=ds.determineDataSource(); - String dataName = DynamicDataSourceContextHolder.peek(); - log.info("mp内置方法--根据部门ID查询信息---当前数据源名称:"+dataName); return getById(deptId); } @@ -218,7 +206,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - @DS("slave") public int updateDept(SysDept dept) { SysDept newParentDept = getById(dept.getParentId()); SysDept oldDept = getById(dept.getDeptId()); @@ -228,8 +215,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl dept.setAncestors(newAncestors); updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors); } - String dataName = DynamicDataSourceContextHolder.peek(); - log.info("mp内置方法--修改保存部门信息---当前数据源名称:"+dataName); int result = baseMapper.updateById(dept); if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) { // 如果该部门是启用状态，则启用该部门的所有上级部门