From 385085826fe060b2aeee4598b302ce12dcc6454e Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sun, 1 Jun 2025 11:13:03 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=A3=8E=E6=A0=BC=20null=20=3D=3D=20xx=20=3D>=20xx=20=3D=3D=20?= =?UTF-8?q?null=EF=BC=88=E6=9B=B4=E7=AC=A6=E5=90=88=E5=A4=A7=E4=BC=97?= =?UTF-8?q?=E9=A3=8E=E6=A0=BC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/common/config/excel/ExcelDictConverter.java | 4 ++-- .../common/config/mybatis/MyBatisPlusMetaObjectHandler.java | 4 ++-- .../common/config/websocket/WebSocketClientServiceImpl.java | 2 +- .../continew/admin/common/context/UserContextHolder.java | 6 +++--- .../top/continew/admin/auth/handler/SocialLoginHandler.java | 2 +- .../admin/auth/service/impl/OnlineUserServiceImpl.java | 2 +- .../continew/admin/system/config/file/FileRecorderImpl.java | 4 ++-- .../admin/system/service/impl/UserSocialServiceImpl.java | 2 +- .../admin/generator/service/impl/GeneratorServiceImpl.java | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/continew-common/src/main/java/top/continew/admin/common/config/excel/ExcelDictConverter.java b/continew-common/src/main/java/top/continew/admin/common/config/excel/ExcelDictConverter.java index ed38c685..bbb13493 100644 --- a/continew-common/src/main/java/top/continew/admin/common/config/excel/ExcelDictConverter.java +++ b/continew-common/src/main/java/top/continew/admin/common/config/excel/ExcelDictConverter.java @@ -59,7 +59,7 @@ public class ExcelDictConverter implements Converter { public WriteCellData convertToExcelData(Object data, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { - if (null == data) { + if (data == null) { return new WriteCellData<>(StringConstants.EMPTY); } // 获取字典项数据 @@ -83,7 +83,7 @@ public class ExcelDictConverter implements Converter { */ private List getDictCode(ExcelContentProperty contentProperty) { DictExcelProperty dictExcelProperty = contentProperty.getField().getAnnotation(DictExcelProperty.class); - if (null == dictExcelProperty) { + if (dictExcelProperty == null) { throw new IllegalArgumentException("Excel 字典转换器异常：请为字段添加 @DictExcelProperty 注解"); } CommonDictItemService dictItemService = SpringUtil.getBean(CommonDictItemService.class); diff --git a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java index 197ba577..8c6696d8 100644 --- a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java +++ b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java @@ -56,7 +56,7 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler { */ @Override public void insertFill(MetaObject metaObject) { - if (null == metaObject) { + if (metaObject == null) { return; } Long createUser = UserContextHolder.getUserId(); @@ -79,7 +79,7 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler { */ @Override public void updateFill(MetaObject metaObject) { - if (null == metaObject) { + if (metaObject == null) { return; } Long updateUser = UserContextHolder.getUserId(); diff --git a/continew-common/src/main/java/top/continew/admin/common/config/websocket/WebSocketClientServiceImpl.java b/continew-common/src/main/java/top/continew/admin/common/config/websocket/WebSocketClientServiceImpl.java index 02d466cd..b7a3d47c 100644 --- a/continew-common/src/main/java/top/continew/admin/common/config/websocket/WebSocketClientServiceImpl.java +++ b/continew-common/src/main/java/top/continew/admin/common/config/websocket/WebSocketClientServiceImpl.java @@ -36,7 +36,7 @@ public class WebSocketClientServiceImpl implements WebSocketClientService { public String getClientId(ServletServerHttpRequest request) { HttpServletRequest servletRequest = request.getServletRequest(); String token = servletRequest.getParameter("token"); - if (null == StpUtil.getLoginIdByToken(token)) { + if (StpUtil.getLoginIdByToken(token) == null) { throw new BusinessException("登录已过期，请重新登录"); } return token; diff --git a/continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java b/continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java index 9134a1fe..e727865c 100644 --- a/continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java +++ b/continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java @@ -66,7 +66,7 @@ public class UserContextHolder { */ public static UserContext getContext() { UserContext context = CONTEXT_HOLDER.get(); - if (null == context) { + if (context == null) { context = StpUtil.getSession().getModel(SaSession.USER, UserContext.class); CONTEXT_HOLDER.set(context); } @@ -81,7 +81,7 @@ public class UserContextHolder { */ public static UserContext getContext(Long userId) { SaSession session = StpUtil.getSessionByLoginId(userId, false); - if (null == session) { + if (session == null) { return null; } return session.getModel(SaSession.USER, UserContext.class); @@ -103,7 +103,7 @@ public class UserContextHolder { */ public static UserExtraContext getExtraContext() { UserExtraContext context = EXTRA_CONTEXT_HOLDER.get(); - if (null == context) { + if (context == null) { context = getExtraContext(StpUtil.getTokenValue()); EXTRA_CONTEXT_HOLDER.set(context); } diff --git a/continew-module-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java b/continew-module-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java index 985e23c6..3ce11393 100644 --- a/continew-module-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java +++ b/continew-module-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java @@ -89,7 +89,7 @@ public class SocialLoginHandler extends AbstractLoginHandler { String openId = authUser.getUuid(); UserSocialDO userSocial = userSocialService.getBySourceAndOpenId(source, openId); UserDO user; - if (null == userSocial) { + if (userSocial == null) { String username = authUser.getUsername(); String nickname = authUser.getNickname(); UserDO existsUser = userService.getByUsername(username); diff --git a/continew-module-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java index 0ddda184..68b531f2 100644 --- a/continew-module-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java @@ -73,7 +73,7 @@ public class OnlineUserServiceImpl implements OnlineUserService { for (Map.Entry> entry : tokenMap.entrySet()) { Long userId = entry.getKey(); UserContext userContext = UserContextHolder.getContext(userId); - if (null == userContext || !this.isMatchNickname(query.getNickname(), userContext) || !this + if (userContext == null || !this.isMatchNickname(query.getNickname(), userContext) || !this .isMatchClientId(query.getClientId(), userContext)) { continue; } diff --git a/continew-module-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java index aa653ab3..14053c06 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java @@ -75,7 +75,7 @@ public class FileRecorderImpl implements FileRecorder { @Override public FileInfo getByUrl(String url) { FileDO file = this.getFileByUrl(url); - if (null == file) { + if (file == null) { return null; } StorageDO storageDO = storageMapper.lambdaQuery().eq(StorageDO::getId, file.getStorageId()).one(); @@ -85,7 +85,7 @@ public class FileRecorderImpl implements FileRecorder { @Override public boolean delete(String url) { FileDO file = this.getFileByUrl(url); - if (null == file) { + if (file == null) { return false; } return fileMapper.lambdaUpdate().eq(FileDO::getId, file.getId()).remove(); diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java index f6368c99..1c0bf33c 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java @@ -51,7 +51,7 @@ public class UserSocialServiceImpl implements UserSocialService { @Override public void saveOrUpdate(UserSocialDO userSocial) { - if (null == userSocial.getCreateTime()) { + if (userSocial.getCreateTime() == null) { baseMapper.insert(userSocial); } else { baseMapper.lambdaUpdate() diff --git a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java index 2b576c7f..3a308f16 100644 --- a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java +++ b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java @@ -119,7 +119,7 @@ public class GeneratorServiceImpl implements GeneratorService { @Override public GenConfigDO getGenConfig(String tableName) throws SQLException { GenConfigDO genConfig = genConfigMapper.selectById(tableName); - if (null == genConfig) { + if (genConfig == null) { genConfig = new GenConfigDO(tableName); // 默认包名（当前包名） String packageName = ClassUtil.getPackage(GeneratorService.class);