From 81678da68363f5269cf2b1fee95c9ad5828b2dd7 Mon Sep 17 00:00:00 2001 From: ikmkj <1@qq,com> Date: Sat, 2 Aug 2025 19:53:47 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=20Hutool?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=E4=BC=98=E5=8C=96=E7=A9=BA=E5=80=BC?= =?UTF-8?q?=E5=88=A4=E6=96=AD-=20=E5=9C=A8=E5=A4=9A=E4=B8=AA=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=E5=92=8C=E6=9C=8D=E5=8A=A1=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E7=B1=BB=E4=B8=AD=EF=BC=8C=E5=B0=86=E5=8E=9F=E5=A7=8B=E7=9A=84?= =?UTF-8?q?=E7=A9=BA=E5=80=BC=E5=88=A4=E6=96=AD=E6=9B=BF=E6=8D=A2=E4=B8=BA?= =?UTF-8?q?=20Hutool=20=E5=B7=A5=E5=85=B7=E7=B1=BB=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95=20-=20=E4=BD=BF=E7=94=A8=20ObjectUtil.isNull?= =?UTF-8?q?()=20=E6=9B=BF=E6=8D=A2=E5=8E=9F=E5=A7=8B=E7=9A=84=20=3D=3D=20n?= =?UTF-8?q?ull=20=E5=88=A4=E6=96=AD=20-=20=E4=BD=BF=E7=94=A8=20ObjectUtil.?= =?UTF-8?q?isNotNull()=20=E6=9B=BF=E6=8D=A2=E5=8E=9F=E5=A7=8B=E7=9A=84=20!?= =?UTF-8?q?=3D=20null=20=E5=88=A4=E6=96=AD=20-=20=E5=9C=A8=E6=9F=90?= =?UTF-8?q?=E4=BA=9B=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=20StrUtil.isBlank()=20=E6=9B=BF=E6=8D=A2=E5=8E=9F=E5=A7=8B?= =?UTF-8?q?=E7=9A=84=20=3D=3D=20null=20=E5=88=A4=E6=96=AD=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E6=9B=B4=E5=87=86=E7=A1=AE=E5=9C=B0=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/bijihoudaun/controller/GroupingController.java | 3 ++- .../com/test/bijihoudaun/controller/ImageController.java | 5 +++-- .../test/bijihoudaun/controller/MarkdownController.java | 5 +++-- .../com/test/bijihoudaun/controller/UserController.java | 3 ++- .../test/bijihoudaun/service/impl/GroupingServiceImpl.java | 3 ++- .../test/bijihoudaun/service/impl/ImageServiceImpl.java | 7 ++++--- .../bijihoudaun/service/impl/MarkdownFileServiceImpl.java | 5 +++-- .../service/impl/RegistrationCodeServiceImpl.java | 3 ++- .../bijihoudaun/service/impl/SystemSettingServiceImpl.java | 3 ++- .../com/test/bijihoudaun/service/impl/UserServiceImpl.java | 7 ++++--- 10 files changed, 27 insertions(+), 17 deletions(-) diff --git a/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/GroupingController.java b/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/GroupingController.java index ffa7d7b..7835faf 100644 --- a/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/GroupingController.java +++ b/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/GroupingController.java @@ -1,6 +1,7 @@ package com.test.bijihoudaun.controller; import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ObjectUtil; import com.test.bijihoudaun.common.response.R; import com.test.bijihoudaun.entity.Grouping; import com.test.bijihoudaun.service.GroupingService; @@ -24,7 +25,7 @@ public class GroupingController { @Operation(summary = "创建分组") @PostMapping public R createGrouping(@RequestBody Grouping grouping) { - if (grouping.getParentId() == null) { + if (ObjectUtil.isNull(grouping.getParentId())) { grouping.setParentId(0L); } Grouping created = groupingService.createGrouping(grouping); diff --git a/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/ImageController.java b/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/ImageController.java index 06c071e..032d551 100644 --- a/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/ImageController.java +++ b/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/ImageController.java @@ -1,6 +1,7 @@ package com.test.bijihoudaun.controller; +import cn.hutool.core.util.StrUtil; import com.test.bijihoudaun.common.response.R; import com.test.bijihoudaun.entity.Image; import com.test.bijihoudaun.service.ImageService; @@ -63,7 +64,7 @@ public class ImageController { @GetMapping("/preview/{url}") @Operation(summary = "在线预览", description = "浏览器直接打开文件流") public void preview(@PathVariable String url, HttpServletResponse resp) throws IOException { - if (url == null) { + if (StrUtil.isBlank(url)) { resp.setStatus(404); R.fail("文件不存在"); } @@ -113,7 +114,7 @@ public class ImageController { * @return 对应的MIME类型 */ private String getContentTypeFromFileExtension(String fileName) { - if (fileName == null || fileName.lastIndexOf('.') == -1) { + if (StrUtil.isBlank(fileName) || !StrUtil.contains(fileName, '.')) { return "application/octet-stream"; } diff --git a/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/MarkdownController.java b/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/MarkdownController.java index cde5258..f2ef4e9 100644 --- a/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/MarkdownController.java +++ b/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/MarkdownController.java @@ -1,5 +1,6 @@ package com.test.bijihoudaun.controller; +import cn.hutool.core.util.ObjectUtil; import com.test.bijihoudaun.common.response.R; import com.test.bijihoudaun.entity.MarkdownFile; import com.test.bijihoudaun.entity.MarkdownFileVO; @@ -36,7 +37,7 @@ public class MarkdownController { @GetMapping("/{id}") public R getMarkdownContent(@PathVariable Long id) { MarkdownFile file = markdownFileService.getMarkdownById(id); - if (file != null) { + if (ObjectUtil.isNotNull(file)) { return R.success(file.getContent()); } return R.fail(); @@ -89,7 +90,7 @@ public class MarkdownController { @PathVariable Long id, @RequestBody String title) { MarkdownFile updatedFile = markdownFileService.updateMarkdownTitle(id, title); - if (updatedFile != null) { + if (ObjectUtil.isNotNull(updatedFile)) { return R.success(updatedFile); } return R.fail("文件未找到或更新失败"); diff --git a/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/UserController.java b/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/UserController.java index acf74af..aa66962 100644 --- a/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/UserController.java +++ b/biji-houdaun/src/main/java/com/test/bijihoudaun/controller/UserController.java @@ -1,6 +1,7 @@ package com.test.bijihoudaun.controller; import com.test.bijihoudaun.bo.UpdatePasswordBo; +import cn.hutool.core.util.ObjectUtil; import com.test.bijihoudaun.common.response.R; import com.test.bijihoudaun.entity.User; import com.test.bijihoudaun.service.RegistrationCodeService; @@ -69,7 +70,7 @@ public class UserController { String username = userDetails.getUsername(); User user = userService.getOne(new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper().eq("username", username)); - if (user == null) { + if (ObjectUtil.isNull(user)) { return R.fail("无法获取用户信息，删除失败"); } diff --git a/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/GroupingServiceImpl.java b/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/GroupingServiceImpl.java index c158147..e2937d7 100644 --- a/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/GroupingServiceImpl.java +++ b/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/GroupingServiceImpl.java @@ -1,6 +1,7 @@ package com.test.bijihoudaun.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.test.bijihoudaun.entity.Grouping; @@ -39,7 +40,7 @@ public class GroupingServiceImpl @Override public List getAllGroupings(Long parentId) { - if (parentId == null){ + if (ObjectUtil.isNull(parentId)){ return groupingMapper.selectList(null); } return groupingMapper.selectList(new LambdaQueryWrapper() diff --git a/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/ImageServiceImpl.java b/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/ImageServiceImpl.java index bd70fe3..45eaa85 100644 --- a/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/ImageServiceImpl.java +++ b/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/ImageServiceImpl.java @@ -2,6 +2,7 @@ package com.test.bijihoudaun.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.stream.CollectorUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -68,7 +69,7 @@ public class ImageServiceImpl @Override public boolean deleteImage(Long id) { Image image = imageMapper.selectById(id); - if (image == null) { + if (ObjectUtil.isNull(image)) { return false; } try { @@ -87,7 +88,7 @@ public class ImageServiceImpl @Override public boolean deleteImageByUrl(String url) { Image image = imageMapper.selectOne(new QueryWrapper().eq("url", url)); - if (image == null) { + if (ObjectUtil.isNull(image)) { return false; } try { @@ -109,7 +110,7 @@ public class ImageServiceImpl } for (String url : urls) { Image image = imageMapper.selectOne(new QueryWrapper().eq("url", url)); - if (image != null) { + if (ObjectUtil.isNotNull(image)) { this.deleteImageByUrl(url); } } diff --git a/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/MarkdownFileServiceImpl.java b/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/MarkdownFileServiceImpl.java index 64b4d77..89030e1 100644 --- a/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/MarkdownFileServiceImpl.java +++ b/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/MarkdownFileServiceImpl.java @@ -1,6 +1,7 @@ package com.test.bijihoudaun.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -40,7 +41,7 @@ public class MarkdownFileServiceImpl long id; markdownFile.setUpdatedAt(new Date()); // 如果ID为空或0，则视为新文件 - if (markdownFile.getId() == null || markdownFile.getId() == 0L) { + if (ObjectUtil.isNull(markdownFile.getId()) || markdownFile.getId() == 0L) { long l = snowflakeIdGenerator.nextId(); markdownFile.setId(l); markdownFile.setCreatedAt(new Date()); @@ -97,7 +98,7 @@ public class MarkdownFileServiceImpl @Override public MarkdownFile updateMarkdownTitle(Long id, String title) { MarkdownFile file = this.getById(id); - if (file != null) { + if (ObjectUtil.isNotNull(file)) { file.setTitle(title); file.setUpdatedAt(new Date()); this.updateById(file); diff --git a/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/RegistrationCodeServiceImpl.java b/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/RegistrationCodeServiceImpl.java index bdcb7f4..fef734c 100644 --- a/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/RegistrationCodeServiceImpl.java +++ b/biji-houdaun/src/main/java/com/test/bijihoudaun/service/impl/RegistrationCodeServiceImpl.java @@ -1,5 +1,6 @@ package com.test.bijihoudaun.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.test.bijihoudaun.entity.RegistrationCode; @@ -36,7 +37,7 @@ public class RegistrationCodeServiceImpl extends ServiceImpl implements Us @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { User user = userMapper.findByUsername(username); - if (user == null) { + if (ObjectUtil.isNull(user)) { throw new UsernameNotFoundException("User not found with username: " + username); } return new org.springframework.security.core.userdetails.User(user.getUsername(), user.getPassword(), new ArrayList<>()); @@ -85,13 +86,13 @@ public class UserServiceImpl extends ServiceImpl implements Us .eq(User::getToken, token); User user = getOne(queryWrapper); // 修改过期检查逻辑 - return user != null && new Date().before(user.getTokenEnddata()); + return ObjectUtil.isNotNull(user) && new Date().before(user.getTokenEnddata()); } @Override public void updatePassword(Long userId, UpdatePasswordBo updatePasswordBo) { User user = getById(userId); - if (user == null) { + if (ObjectUtil.isNull(user)) { throw new BusinessException("用户不存在"); } if (!PasswordUtils.verify(updatePasswordBo.getOldPassword(), user.getPassword())) {