update 优化代码格式和可读性,简化条件判断

This commit is contained in:
AprilWind
2026-05-20 13:33:14 +08:00
parent 491aea4e11
commit a95790b465
5 changed files with 17 additions and 20 deletions
@@ -88,7 +88,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
*/ */
@Override @Override
public boolean selectRegisterEnabled() { public boolean selectRegisterEnabled() {
return Convert.toBool(this.selectConfigByKey("sys.account.registerUser")); return Convert.toBool(this.getConfigValue("sys.account.registerUser"));
} }
/** /**
@@ -146,7 +146,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
@CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey") @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey")
@Override @Override
public String updateConfig(SysConfigBo bo) { public String updateConfig(SysConfigBo bo) {
int row = 0; int row;
SysConfig config = MapstructUtils.convert(bo, SysConfig.class); SysConfig config = MapstructUtils.convert(bo, SysConfig.class);
if (config.getConfigId() != null) { if (config.getConfigId() != null) {
SysConfig temp = configMapper.selectById(config.getConfigId()); SysConfig temp = configMapper.selectById(config.getConfigId());
@@ -354,9 +354,9 @@ public class SysMenuServiceImpl implements ISysMenuService {
String routeName = StringUtils.isEmpty(menu.getRouteName()) ? path : menu.getRouteName(); String routeName = StringUtils.isEmpty(menu.getRouteName()) ? path : menu.getRouteName();
List<SysMenu> sysMenuList = menuMapper.lambda() List<SysMenu> sysMenuList = menuMapper.lambda()
.in(SysMenu::getMenuType, SystemConstants.TYPE_DIR, SystemConstants.TYPE_MENU) .in(SysMenu::getMenuType, SystemConstants.TYPE_DIR, SystemConstants.TYPE_MENU)
.and(w -> { .and(w ->
w.eq(SysMenu::getPath, path).or().eq(SysMenu::getPath, routeName); w.eq(SysMenu::getPath, path).or().eq(SysMenu::getPath, routeName)
}).list(); ).list();
for (SysMenu sysMenu : sysMenuList) { for (SysMenu sysMenu : sysMenuList) {
if (!sysMenu.getMenuId().equals(menuId)) { if (!sysMenu.getMenuId().equals(menuId)) {
Long dbParentId = sysMenu.getParentId(); Long dbParentId = sysMenu.getParentId();
@@ -209,11 +209,11 @@ public class SysMessageServiceImpl implements ISysMessageService, MessageService
// 仅查询30天内消息 // 仅查询30天内消息
.ge(SysMessage::getCreateTime, LocalDateTime.now().minusDays(BOX_DAYS)) .ge(SysMessage::getCreateTime, LocalDateTime.now().minusDays(BOX_DAYS))
// 全局消息 或 当前用户在接收人范围内 // 全局消息 或 当前用户在接收人范围内
.and(wrapper -> { .and(wrapper ->
wrapper.eq(SysMessage::getSendUserIds, GLOBAL_USER_IDS) wrapper.eq(SysMessage::getSendUserIds, GLOBAL_USER_IDS)
.or() .or()
.findInSet(userId, SysMessage::getSendUserIds); .findInSet(userId, SysMessage::getSendUserIds)
}) )
.orderByDesc(SysMessage::getCreateTime, SysMessage::getMessageId) .orderByDesc(SysMessage::getCreateTime, SysMessage::getMessageId)
// 分页查询(只查第一页,最多100条) // 分页查询(只查第一页,最多100条)
.list(new Page<>(1, BOX_LIMIT, false)); .list(new Page<>(1, BOX_LIMIT, false));
@@ -201,10 +201,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
.select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey) .select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey)
.eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey()) .eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey())
.one(); .one();
if (ObjectUtil.isNotNull(info) && info.getOssConfigId() != ossConfigId) { return ObjectUtil.isNull(info) || ObjectUtil.equals(info.getOssConfigId(), ossConfigId);
return false;
}
return true;
} }
/** /**
@@ -29,7 +29,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService, Permissi
/** /**
* 获取角色数据权限 * 获取角色数据权限
* *
* @param userId 用户id * @param userId 用户id
* @return 角色权限信息 * @return 角色权限信息
*/ */
@Override @Override
@@ -47,7 +47,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService, Permissi
/** /**
* 获取菜单数据权限 * 获取菜单数据权限
* *
* @param userId 用户id * @param userId 用户id
* @return 菜单权限信息 * @return 菜单权限信息
*/ */
@Override @Override
@@ -76,11 +76,11 @@ public class SysPermissionServiceImpl implements ISysPermissionService, Permissi
List<Long> roleIds = StreamUtils.toList(roles, RoleDTO::getRoleId); List<Long> roleIds = StreamUtils.toList(roles, RoleDTO::getRoleId);
Map<Long, Set<String>> permsRoleIds = menuService.selectMenuPermsByRoleIds(roleIds); Map<Long, Set<String>> permsRoleIds = menuService.selectMenuPermsByRoleIds(roleIds);
Map<String, List<Long>> rolePermsMap = new LinkedHashMap<>(); Map<String, List<Long>> rolePermsMap = new LinkedHashMap<>();
permsRoleIds.forEach((roleId, perms) -> { permsRoleIds.forEach((roleId, perms) ->
perms.forEach(perm -> { perms.forEach(perm ->
rolePermsMap.computeIfAbsent(perm, key -> new ArrayList<>()).add(roleId); rolePermsMap.computeIfAbsent(perm, key -> new ArrayList<>()).add(roleId)
}); )
}); );
return rolePermsMap; return rolePermsMap;
} }
} }