From 91ce812225f3bb10550abac6098e1b7f1345c58e Mon Sep 17 00:00:00 2001
From: Yjoioooo <693337446@qq.com>
Date: 星期一, 27 三月 2023 11:40:28 +0800
Subject: [PATCH] update 统一注入变量命名规则
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
index 14f2113..785e48c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
@@ -43,16 +43,16 @@
public class SysTenantServiceImpl implements ISysTenantService {
private final SysTenantMapper baseMapper;
- private final SysTenantPackageMapper sysTenantPackageMapper;
- private final SysUserMapper sysUserMapper;
- private final SysDeptMapper sysDeptMapper;
- private final SysRoleMapper sysRoleMapper;
- private final SysRoleMenuMapper sysRoleMenuMapper;
- private final SysRoleDeptMapper sysRoleDeptMapper;
- private final SysUserRoleMapper sysUserRoleMapper;
- private final SysDictTypeMapper sysDictTypeMapper;
- private final SysDictDataMapper sysDictDataMapper;
- private final SysConfigMapper sysConfigMapper;
+ private final SysTenantPackageMapper tenantPackageMapper;
+ private final SysUserMapper userMapper;
+ private final SysDeptMapper deptMapper;
+ private final SysRoleMapper roleMapper;
+ private final SysRoleMenuMapper roleMenuMapper;
+ private final SysRoleDeptMapper roleDeptMapper;
+ private final SysUserRoleMapper userRoleMapper;
+ private final SysDictTypeMapper dictTypeMapper;
+ private final SysDictDataMapper dictDataMapper;
+ private final SysConfigMapper configMapper;
/**
* 鏌ヨ绉熸埛
@@ -139,14 +139,14 @@
dept.setLeader(bo.getUsername());
dept.setParentId(Constants.TOP_PARENT_ID);
dept.setAncestors(Constants.TOP_PARENT_ID.toString());
- sysDeptMapper.insert(dept);
+ deptMapper.insert(dept);
Long deptId = dept.getDeptId();
// 瑙掕壊鍜岄儴闂ㄥ叧鑱旇〃
SysRoleDept roleDept = new SysRoleDept();
roleDept.setRoleId(roleId);
roleDept.setDeptId(deptId);
- sysRoleDeptMapper.insert(roleDept);
+ roleDeptMapper.insert(roleDept);
// 鍒涘缓绯荤粺鐢ㄦ埛
SysUser user = new SysUser();
@@ -155,18 +155,18 @@
user.setNickName(bo.getUsername());
user.setPassword(BCrypt.hashpw(bo.getPassword()));
user.setDeptId(deptId);
- sysUserMapper.insert(user);
+ userMapper.insert(user);
// 鐢ㄦ埛鍜岃鑹插叧鑱旇〃
SysUserRole userRole = new SysUserRole();
userRole.setUserId(user.getUserId());
userRole.setRoleId(roleId);
- sysUserRoleMapper.insert(userRole);
+ userRoleMapper.insert(userRole);
String defaultTenantId = TenantConstants.DEFAULT_TENANT_ID;
- List<SysDictType> dictTypeList = sysDictTypeMapper.selectList(
+ List<SysDictType> dictTypeList = dictTypeMapper.selectList(
new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getTenantId, defaultTenantId));
- List<SysDictData> dictDataList = sysDictDataMapper.selectList(
+ List<SysDictData> dictDataList = dictDataMapper.selectList(
new LambdaQueryWrapper<SysDictData>().eq(SysDictData::getTenantId, defaultTenantId));
for (SysDictType dictType : dictTypeList) {
dictType.setDictId(null);
@@ -176,16 +176,16 @@
dictData.setDictCode(null);
dictData.setTenantId(tenantId);
}
- sysDictTypeMapper.insertBatch(dictTypeList);
- sysDictDataMapper.insertBatch(dictDataList);
+ dictTypeMapper.insertBatch(dictTypeList);
+ dictDataMapper.insertBatch(dictDataList);
- List<SysConfig> sysConfigList = sysConfigMapper.selectList(
+ List<SysConfig> sysConfigList = configMapper.selectList(
new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getTenantId, defaultTenantId));
for (SysConfig config : sysConfigList) {
config.setConfigId(null);
config.setTenantId(tenantId);
}
- sysConfigMapper.insertBatch(sysConfigList);
+ configMapper.insertBatch(sysConfigList);
TenantHelper.disableIgnore();
return true;
@@ -216,7 +216,7 @@
*/
private Long createTenantRole(String tenantId, Long packageId) {
// 鑾峰彇绉熸埛濂楅
- SysTenantPackage tenantPackage = sysTenantPackageMapper.selectById(packageId);
+ SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId);
if (ObjectUtil.isNull(tenantPackage)) {
throw new ServiceException("濂楅涓嶅瓨鍦�");
}
@@ -230,7 +230,7 @@
role.setRoleKey(TenantConstants.TENANT_ADMIN_ROLE_KEY);
role.setRoleSort(1);
role.setStatus(TenantConstants.NORMAL);
- sysRoleMapper.insert(role);
+ roleMapper.insert(role);
Long roleId = role.getRoleId();
// 鍒涘缓瑙掕壊鑿滃崟
@@ -241,7 +241,7 @@
roleMenu.setMenuId(menuId);
roleMenus.add(roleMenu);
});
- sysRoleMenuMapper.insertBatch(roleMenus);
+ roleMenuMapper.insertBatch(roleMenus);
return roleId;
}
@@ -319,7 +319,7 @@
if (tenant.getAccountCount() == -1) {
return true;
}
- Long userNumber = sysUserMapper.selectCount(new LambdaQueryWrapper<>());
+ Long userNumber = userMapper.selectCount(new LambdaQueryWrapper<>());
// 濡傛灉浣欓澶т簬0浠ｈ〃杩樻湁鍙敤鍚嶉
return tenant.getAccountCount() - userNumber > 0;
}
@@ -345,8 +345,8 @@
@Transactional(rollbackFor = Exception.class)
public Boolean syncTenantPackage(String tenantId, String packageId) {
TenantHelper.enableIgnore();
- SysTenantPackage tenantPackage = sysTenantPackageMapper.selectById(packageId);
- List<SysRole> roles = sysRoleMapper.selectList(
+ SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId);
+ List<SysRole> roles = roleMapper.selectList(
new LambdaQueryWrapper<SysRole>().eq(SysRole::getTenantId, tenantId));
List<Long> roleIds = new ArrayList<>(roles.size() - 1);
List<Long> menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong);
@@ -359,14 +359,14 @@
roleMenu.setMenuId(menuId);
roleMenus.add(roleMenu);
});
- sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, item.getRoleId()));
- sysRoleMenuMapper.insertBatch(roleMenus);
+ roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, item.getRoleId()));
+ roleMenuMapper.insertBatch(roleMenus);
} else {
roleIds.add(item.getRoleId());
}
});
if (!roleIds.isEmpty()) {
- sysRoleMenuMapper.delete(
+ roleMenuMapper.delete(
new LambdaQueryWrapper<SysRoleMenu>().in(SysRoleMenu::getRoleId, roleIds).notIn(!menuIds.isEmpty(), SysRoleMenu::getMenuId, menuIds));
}
TenantHelper.disableIgnore();
--
Gitblit v1.9.3