ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-31 22:57:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

style: 调整代码风格 null != xx => xx != null（更符合大众风格）

Browse Source
This commit is contained in:
Charles7c
2025-05-21 22:21:39 +08:00
parent 0f3e94f32f
commit a07a2dcd65
12 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
continew-common/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java
View File

@@ -155,7 +155,7 @@ public class GlobalExceptionHandler {
}
String sizeLimit;
Throwable cause = e.getCause();
if (null != cause) {
if (cause != null) {
msg = msg.concat(cause.getMessage().toLowerCase());
}
if (msg.contains("larger than")) {

2
continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java
View File

@@ -106,7 +106,7 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler {
private void fillFieldValue(MetaObject metaObject, String fieldName, Object fillFieldValue, boolean isOverride) {
if (metaObject.hasSetter(fieldName)) {
Object fieldValue = metaObject.getValue(fieldName);
setFieldValByName(fieldName, null != fieldValue && !isOverride ? fieldValue : fillFieldValue, metaObject);
setFieldValByName(fieldName, fieldValue != null && !isOverride ? fieldValue : fillFieldValue, metaObject);
}
}
}

5
continew-module-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java
View File

@@ -56,7 +56,6 @@ import top.continew.starter.core.validation.ValidationUtils;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.Objects;
/**
* 第三方账号登录处理器
@@ -95,7 +94,7 @@ public class SocialLoginHandler extends AbstractLoginHandler<SocialLoginReq> {
String nickname = authUser.getNickname();
UserDO existsUser = userService.getByUsername(username);
String randomStr = RandomUtil.randomString(RandomUtil.BASE_CHAR, 5);
if (null != existsUser || !ReUtil.isMatch(RegexConstants.USERNAME, username)) {
if (existsUser != null || !ReUtil.isMatch(RegexConstants.USERNAME, username)) {
username = randomStr + IdUtil.fastSimpleUUID();
}
if (!ReUtil.isMatch(RegexConstants.GENERAL_NAME, nickname)) {
@@ -104,7 +103,7 @@ public class SocialLoginHandler extends AbstractLoginHandler<SocialLoginReq> {
user = new UserDO();
user.setUsername(username);
user.setNickname(nickname);
if (Objects.nonNull(authUser.getGender())) {
if (authUser.getGender() != null) {
user.setGender(GenderEnum.valueOf(authUser.getGender().name()));
}
user.setAvatar(authUser.getAvatar());

2
continew-module-system/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java
View File

@@ -150,7 +150,7 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptRes
return baseMapper.lambdaQuery()
.eq(DeptDO::getName, name)
.eq(DeptDO::getParentId, parentId)
.ne(null != id, DeptDO::getId, id)
.ne(id != null, DeptDO::getId, id)
.exists();
}

2
continew-module-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java
View File

@@ -102,7 +102,7 @@ public class DictItemServiceImpl extends BaseServiceImpl<DictItemMapper, DictIte
return baseMapper.lambdaQuery()
.eq(DictItemDO::getValue, value)
.eq(DictItemDO::getDictId, dictId)
.ne(null != id, DictItemDO::getId, id)
.ne(id != null, DictItemDO::getId, id)
.exists();
}

4
continew-module-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java
View File

@@ -86,7 +86,7 @@ public class DictServiceImpl extends BaseServiceImpl<DictMapper, DictDO, DictRes
* @return 是否存在
*/
private boolean isNameExists(String name, Long id) {
return baseMapper.lambdaQuery().eq(DictDO::getName, name).ne(null != id, DictDO::getId, id).exists();
return baseMapper.lambdaQuery().eq(DictDO::getName, name).ne(id != null, DictDO::getId, id).exists();
}
/**
@@ -97,6 +97,6 @@ public class DictServiceImpl extends BaseServiceImpl<DictMapper, DictDO, DictRes
* @return 是否存在
*/
private boolean isCodeExists(String code, Long id) {
return baseMapper.lambdaQuery().eq(DictDO::getCode, code).ne(null != id, DictDO::getId, id).exists();
return baseMapper.lambdaQuery().eq(DictDO::getCode, code).ne(id != null, DictDO::getId, id).exists();
}
}

2
continew-module-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java
View File

@@ -123,7 +123,7 @@ public class LogServiceImpl implements LogService {
.and(StrUtil.isNotBlank(createUserString), q -> q.like("t2.username", createUserString)
.or()
.like("t2.nickname", createUserString))
.eq(null != status, "t1.status", status)
.eq(status != null, "t1.status", status)
.between(CollUtil.isNotEmpty(createTimeList), "t1.create_time", CollUtil.getFirst(createTimeList), CollUtil
.getLast(createTimeList));
}

4
continew-module-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java
View File

@@ -119,7 +119,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuRes
return baseMapper.lambdaQuery()
.eq(MenuDO::getTitle, title)
.eq(MenuDO::getParentId, parentId)
.ne(null != id, MenuDO::getId, id)
.ne(id != null, MenuDO::getId, id)
.exists();
}
@@ -134,7 +134,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuRes
return baseMapper.lambdaQuery()
.eq(MenuDO::getName, name)
.ne(MenuDO::getType, MenuTypeEnum.BUTTON)
.ne(null != id, MenuDO::getId, id)
.ne(id != null, MenuDO::getId, id)
.exists();
}
}

6
continew-module-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java
View File

@@ -230,7 +230,7 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleRes
* @return 是否存在
*/
private boolean isNameExists(String name, Long id) {
return baseMapper.lambdaQuery().eq(RoleDO::getName, name).ne(null != id, RoleDO::getId, id).exists();
return baseMapper.lambdaQuery().eq(RoleDO::getName, name).ne(id != null, RoleDO::getId, id).exists();
}
/**
@@ -241,7 +241,7 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleRes
* @return 是否存在
*/
private boolean isCodeExists(String code, Long id) {
return baseMapper.lambdaQuery().eq(RoleDO::getCode, code).ne(null != id, RoleDO::getId, id).exists();
return baseMapper.lambdaQuery().eq(RoleDO::getCode, code).ne(id != null, RoleDO::getId, id).exists();
}
/**
@@ -253,7 +253,7 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleRes
List<Long> userIdList = userRoleService.listUserIdByRoleId(roleId);
userIdList.parallelStream().forEach(userId -> {
UserContext userContext = UserContextHolder.getContext(userId);
if (null != userContext) {
if (userContext != null) {
userContext.setRoles(this.listByUserId(userId));
userContext.setPermissions(this.listPermissionByUserId(userId));
UserContextHolder.setContext(userContext);

4
continew-module-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
View File

@@ -231,7 +231,7 @@ public class StorageServiceImpl extends BaseServiceImpl<StorageMapper, StorageDO
*/
private String decryptSecretKey(String encryptSecretKey, StorageDO storage) {
// 修改时，如果 SecretKey 不修改，需要手动修正
if (null != storage) {
if (storage != null) {
boolean isSecretKeyNotUpdate = StrUtil.isBlank(encryptSecretKey) || encryptSecretKey
.contains(StringConstants.ASTERISK);
if (isSecretKeyNotUpdate) {
@@ -253,6 +253,6 @@ public class StorageServiceImpl extends BaseServiceImpl<StorageMapper, StorageDO
* @return 是否存在
*/
private boolean isCodeExists(String code, Long id) {
return baseMapper.lambdaQuery().eq(StorageDO::getCode, code).ne(null != id, StorageDO::getId, id).exists();
return baseMapper.lambdaQuery().eq(StorageDO::getCode, code).ne(id != null, StorageDO::getId, id).exists();
}
}

14
continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java
View File

@@ -505,7 +505,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
List<Long> userIdList = query.getUserIds();
// 获取排除用户 ID 列表
List<Long> excludeUserIdList = null;
if (null != query.getRoleId()) {
if (query.getRoleId() != null) {
excludeUserIdList = userRoleService.listUserIdByRoleId(query.getRoleId());
}
return new QueryWrapper<UserDO>().and(StrUtil.isNotBlank(description), q -> q.like("t1.username", description)
@@ -513,10 +513,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
.like("t1.nickname", description)
.or()
.like("t1.description", description))
.eq(null != status, "t1.status", status)
.eq(status != null, "t1.status", status)
.between(CollUtil.isNotEmpty(createTimeList), "t1.create_time", CollUtil.getFirst(createTimeList), CollUtil
.getLast(createTimeList))
.and(null != deptId && !SysConstants.SUPER_DEPT_ID.equals(deptId), q -> {
.and(deptId != null && !SysConstants.SUPER_DEPT_ID.equals(deptId), q -> {
List<Long> deptIdList = deptService.listChildren(deptId)
.stream()
.map(DeptDO::getId)
@@ -679,7 +679,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
* @return 是否存在
*/
private boolean isNameExists(String name, Long id) {
return baseMapper.lambdaQuery().eq(UserDO::getUsername, name).ne(null != id, UserDO::getId, id).exists();
return baseMapper.lambdaQuery().eq(UserDO::getUsername, name).ne(id != null, UserDO::getId, id).exists();
}
/**
@@ -691,7 +691,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
*/
private boolean isEmailExists(String email, Long id) {
Long count = baseMapper.selectCountByEmail(email, id);
return null != count && count > 0;
return count != null && count > 0;
}
/**
@@ -703,7 +703,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
*/
private boolean isPhoneExists(String phone, Long id) {
Long count = baseMapper.selectCountByPhone(phone, id);
return null != count && count > 0;
return count != null && count > 0;
}
/**
@@ -725,7 +725,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
*/
private void updateContext(Long id) {
UserContext userContext = UserContextHolder.getContext(id);
if (null != userContext) {
if (userContext != null) {
userContext.setRoles(roleService.listByUserId(id));
userContext.setPermissions(roleService.listPermissionByUserId(id));
UserContextHolder.setContext(userContext);

6
continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java
View File

@@ -134,7 +134,7 @@ public class GeneratorServiceImpl implements GeneratorService {
GenConfigDO lastGenConfig = genConfigMapper.selectOne(Wrappers.lambdaQuery(GenConfigDO.class)
.orderByDesc(GenConfigDO::getCreateTime)
.last("LIMIT 1"));
if (null != lastGenConfig) {
if (lastGenConfig != null) {
genConfig.setAuthor(lastGenConfig.getAuthor());
}
}
@@ -163,7 +163,7 @@ public class GeneratorServiceImpl implements GeneratorService {
FieldConfigDO fieldConfig = Optional.ofNullable(fieldConfigMap.get(column.getName()))
.orElseGet(() -> new FieldConfigDO(column));
// 更新已有字段配置
if (null != fieldConfig.getCreateTime()) {
if (fieldConfig.getCreateTime() != null) {
fieldConfig.setColumnType(column.getTypeName());
fieldConfig.setColumnSize(column.getSize());
}
@@ -213,7 +213,7 @@ public class GeneratorServiceImpl implements GeneratorService {
// 保存或更新生成配置信息
GenConfigDO newGenConfig = req.getGenConfig();
GenConfigDO oldGenConfig = genConfigMapper.selectById(tableName);
if (null != oldGenConfig) {
if (oldGenConfig != null) {
BeanUtil.copyProperties(newGenConfig, oldGenConfig);
genConfigMapper.updateById(oldGenConfig);
} else {