From 89c163b3afb0e0db764b38467964fad140f46e55 Mon Sep 17 00:00:00 2001 From: xiongxiaoyang <773861846@qq.com> Date: Thu, 19 May 2022 06:41:02 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=88=97=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../novel/core/constant/ApiRouterConsts.java | 2 +- .../novel/core/constant/DatabaseConsts.java | 117 ++++++------------ .../core/constant/SystemConfigConsts.java | 7 +- .../novel/manager/AuthorInfoCacheManager.java | 2 +- .../manager/BookCategoryCacheManager.java | 2 +- .../manager/BookContentCacheManager.java | 3 +- .../novel/manager/BookInfoCacheManager.java | 8 +- .../novel/manager/BookRankCacheManager.java | 3 +- .../novel/service/impl/BookServiceImpl.java | 18 +-- .../novel/service/impl/NewsServiceImpl.java | 2 +- .../novel/service/impl/UserServiceImpl.java | 6 +- 11 files changed, 64 insertions(+), 106 deletions(-) diff --git a/src/main/java/io/github/xxyopen/novel/core/constant/ApiRouterConsts.java b/src/main/java/io/github/xxyopen/novel/core/constant/ApiRouterConsts.java index 8f09ec1..881f95f 100644 --- a/src/main/java/io/github/xxyopen/novel/core/constant/ApiRouterConsts.java +++ b/src/main/java/io/github/xxyopen/novel/core/constant/ApiRouterConsts.java @@ -9,7 +9,7 @@ package io.github.xxyopen.novel.core.constant; public class ApiRouterConsts { private ApiRouterConsts() { - throw new IllegalStateException("Constant class"); + throw new IllegalStateException(SystemConfigConsts.CONST_INSTANCE_EXCEPTION_MSG); } /** diff --git a/src/main/java/io/github/xxyopen/novel/core/constant/DatabaseConsts.java b/src/main/java/io/github/xxyopen/novel/core/constant/DatabaseConsts.java index 34875e5..173c384 100644 --- a/src/main/java/io/github/xxyopen/novel/core/constant/DatabaseConsts.java +++ b/src/main/java/io/github/xxyopen/novel/core/constant/DatabaseConsts.java @@ -16,19 +16,12 @@ public class DatabaseConsts { */ public static class UserInfoTable { - @Getter - public enum ColumnEnum { - - USERNAME("username"); - - private String name; - - ColumnEnum(String name) { - this.name = name; - } - + private UserInfoTable() { + throw new IllegalStateException(SystemConfigConsts.CONST_INSTANCE_EXCEPTION_MSG); } + public static final String COLUMN_USERNAME = "username"; + } /** @@ -36,19 +29,12 @@ public class DatabaseConsts { */ public static class AuthorInfoTable { - @Getter - public enum ColumnEnum { - - USER_ID("user_id"); - - private String name; - - ColumnEnum(String name) { - this.name = name; - } - + private AuthorInfoTable() { + throw new IllegalStateException(SystemConfigConsts.CONST_INSTANCE_EXCEPTION_MSG); } + public static final String COLUMN_USER_ID = "user_id"; + } /** @@ -56,19 +42,12 @@ public class DatabaseConsts { */ public static class BookCategoryTable { - @Getter - public enum ColumnEnum { - - WORK_DIRECTION("work_direction"); - - private String name; - - ColumnEnum(String name) { - this.name = name; - } - + private BookCategoryTable() { + throw new IllegalStateException(SystemConfigConsts.CONST_INSTANCE_EXCEPTION_MSG); } + public static final String COLUMN_WORK_DIRECTION = "work_direction"; + } /** @@ -76,21 +55,16 @@ public class DatabaseConsts { */ public static class BookTable { - @Getter - public enum ColumnEnum { - - CATEGORY_ID("category_id"), - VISIT_COUNT("visit_count"), - LAST_CHAPTER_UPDATE_TIME("last_chapter_update_time"); - - private String name; - - ColumnEnum(String name) { - this.name = name; - } - + private BookTable() { + throw new IllegalStateException(SystemConfigConsts.CONST_INSTANCE_EXCEPTION_MSG); } + public static final String COLUMN_CATEGORY_ID = "category_id"; + + public static final String COLUMN_VISIT_COUNT = "visit_count"; + + public static final String COLUMN_LAST_CHAPTER_UPDATE_TIME = "last_chapter_update_time"; + } /** @@ -98,21 +72,16 @@ public class DatabaseConsts { */ public static class BookChapterTable { - @Getter - public enum ColumnEnum { - - BOOK_ID("book_id"), - CHAPTER_NUM("chapter_num"), - LAST_CHAPTER_UPDATE_TIME("last_chapter_update_time"); - - private String name; - - ColumnEnum(String name) { - this.name = name; - } - + private BookChapterTable() { + throw new IllegalStateException(SystemConfigConsts.CONST_INSTANCE_EXCEPTION_MSG); } + public static final String COLUMN_BOOK_ID = "book_id"; + + public static final String COLUMN_CHAPTER_NUM = "chapter_num"; + + public static final String COLUMN_LAST_CHAPTER_UPDATE_TIME = "last_chapter_update_time"; + } /** @@ -120,19 +89,12 @@ public class DatabaseConsts { */ public static class BookContentTable { - @Getter - public enum ColumnEnum { - - CHAPTER_ID("chapter_id"); - - private String name; - - ColumnEnum(String name) { - this.name = name; - } - + private BookContentTable() { + throw new IllegalStateException(SystemConfigConsts.CONST_INSTANCE_EXCEPTION_MSG); } + public static final String COLUMN_CHAPTER_ID = "chapter_id"; + } /** @@ -140,19 +102,12 @@ public class DatabaseConsts { */ public static class NewsContentTable { - @Getter - public enum ColumnEnum { - - NEWS_ID("news_id"); - - private String name; - - ColumnEnum(String name) { - this.name = name; - } - + private NewsContentTable() { + throw new IllegalStateException(SystemConfigConsts.CONST_INSTANCE_EXCEPTION_MSG); } + public static final String COLUMN_NEWS_ID = "news_id"; + } /** diff --git a/src/main/java/io/github/xxyopen/novel/core/constant/SystemConfigConsts.java b/src/main/java/io/github/xxyopen/novel/core/constant/SystemConfigConsts.java index 15145ca..a49c15f 100644 --- a/src/main/java/io/github/xxyopen/novel/core/constant/SystemConfigConsts.java +++ b/src/main/java/io/github/xxyopen/novel/core/constant/SystemConfigConsts.java @@ -9,7 +9,7 @@ package io.github.xxyopen.novel.core.constant; public class SystemConfigConsts { private SystemConfigConsts() { - throw new IllegalStateException("Constant class"); + throw new IllegalStateException(CONST_INSTANCE_EXCEPTION_MSG); } /** @@ -32,4 +32,9 @@ public class SystemConfigConsts { * */ public static final String NOVEL_ADMIN_KEY = "admin"; + /** + * 常量类实例化异常信息 + * */ + public static final String CONST_INSTANCE_EXCEPTION_MSG = "Constant class"; + } diff --git a/src/main/java/io/github/xxyopen/novel/manager/AuthorInfoCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/AuthorInfoCacheManager.java index 54cb753..4de717b 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/AuthorInfoCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/AuthorInfoCacheManager.java @@ -32,7 +32,7 @@ public class AuthorInfoCacheManager { public AuthorInfoDto getAuthor(Long userId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper - .eq(DatabaseConsts.AuthorInfoTable.ColumnEnum.USER_ID.getName(), userId) + .eq(DatabaseConsts.AuthorInfoTable.COLUMN_USER_ID, userId) .last(DatabaseConsts.SqlEnum.LIMIT_1.getSql()); AuthorInfo authorInfo = authorInfoMapper.selectOne(queryWrapper); if (Objects.isNull(authorInfo)) { diff --git a/src/main/java/io/github/xxyopen/novel/manager/BookCategoryCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/BookCategoryCacheManager.java index 909698f..4ba6993 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/BookCategoryCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/BookCategoryCacheManager.java @@ -31,7 +31,7 @@ public class BookCategoryCacheManager { , value = CacheConsts.BOOK_CATEGORY_LIST_CACHE_NAME) public List listCategory(Integer workDirection) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(DatabaseConsts.BookCategoryTable.ColumnEnum.WORK_DIRECTION.getName(), workDirection); + queryWrapper.eq(DatabaseConsts.BookCategoryTable.COLUMN_WORK_DIRECTION, workDirection); return bookCategoryMapper.selectList(queryWrapper).stream().map(v -> BookCategoryRespDto.builder() .id(v.getId()) diff --git a/src/main/java/io/github/xxyopen/novel/manager/BookContentCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/BookContentCacheManager.java index c96c025..be0f8a6 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/BookContentCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/BookContentCacheManager.java @@ -28,7 +28,8 @@ public class BookContentCacheManager { , value = CacheConsts.BOOK_CONTENT_CACHE_NAME) public String getBookContent(Long chapterId) { QueryWrapper contentQueryWrapper = new QueryWrapper<>(); - contentQueryWrapper.eq(DatabaseConsts.BookContentTable.ColumnEnum.CHAPTER_ID.getName(), chapterId).last(DatabaseConsts.SqlEnum.LIMIT_1.getSql()); + contentQueryWrapper.eq(DatabaseConsts.BookContentTable.COLUMN_CHAPTER_ID, chapterId) + .last(DatabaseConsts.SqlEnum.LIMIT_1.getSql()); BookContent bookContent = bookContentMapper.selectOne(contentQueryWrapper); return bookContent.getContent(); } diff --git a/src/main/java/io/github/xxyopen/novel/manager/BookInfoCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/BookInfoCacheManager.java index 831ed41..0320409 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/BookInfoCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/BookInfoCacheManager.java @@ -39,8 +39,8 @@ public class BookInfoCacheManager { // 查询首章ID QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper - .eq(DatabaseConsts.BookChapterTable.ColumnEnum.BOOK_ID.getName(), id) - .orderByAsc(DatabaseConsts.BookChapterTable.ColumnEnum.CHAPTER_NUM.getName()) + .eq(DatabaseConsts.BookChapterTable.COLUMN_BOOK_ID, id) + .orderByAsc(DatabaseConsts.BookChapterTable.COLUMN_CHAPTER_NUM) .last(DatabaseConsts.SqlEnum.LIMIT_1.getSql()); BookChapter firstBookChapter = bookChapterMapper.selectOne(queryWrapper); // 组装响应对象 @@ -69,8 +69,8 @@ public class BookInfoCacheManager { , value = CacheConsts.LAST_UPDATE_BOOK_ID_LIST_CACHE_NAME) public List getLastUpdateIdList(Long categoryId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(DatabaseConsts.BookTable.ColumnEnum.CATEGORY_ID.getName(), categoryId) - .orderByDesc(DatabaseConsts.BookTable.ColumnEnum.LAST_CHAPTER_UPDATE_TIME.getName()) + queryWrapper.eq(DatabaseConsts.BookTable.COLUMN_CATEGORY_ID, categoryId) + .orderByDesc(DatabaseConsts.BookTable.COLUMN_LAST_CHAPTER_UPDATE_TIME) .last(DatabaseConsts.SqlEnum.LIMIT_500.getSql()); return bookInfoMapper.selectList(queryWrapper).stream().map(BookInfo::getId).toList(); } diff --git a/src/main/java/io/github/xxyopen/novel/manager/BookRankCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/BookRankCacheManager.java index 55884c5..16ef8cd 100644 --- a/src/main/java/io/github/xxyopen/novel/manager/BookRankCacheManager.java +++ b/src/main/java/io/github/xxyopen/novel/manager/BookRankCacheManager.java @@ -31,8 +31,7 @@ public class BookRankCacheManager { , value = CacheConsts.BOOK_VISIT_RANK_CACHE_NAME) public List listVisitRankBooks() { QueryWrapper bookInfoQueryWrapper = new QueryWrapper<>(); - bookInfoQueryWrapper - .orderByDesc(DatabaseConsts.BookTable.ColumnEnum.VISIT_COUNT.getName()); + bookInfoQueryWrapper.orderByDesc(DatabaseConsts.BookTable.COLUMN_VISIT_COUNT); return getBookRankRespDtos(bookInfoQueryWrapper); } diff --git a/src/main/java/io/github/xxyopen/novel/service/impl/BookServiceImpl.java b/src/main/java/io/github/xxyopen/novel/service/impl/BookServiceImpl.java index 6bf79df..88ff33a 100644 --- a/src/main/java/io/github/xxyopen/novel/service/impl/BookServiceImpl.java +++ b/src/main/java/io/github/xxyopen/novel/service/impl/BookServiceImpl.java @@ -103,7 +103,7 @@ public class BookServiceImpl implements BookService { // 查询章节总数 QueryWrapper chapterQueryWrapper = new QueryWrapper<>(); - chapterQueryWrapper.eq(DatabaseConsts.BookChapterTable.ColumnEnum.BOOK_ID.getName(), bookId); + chapterQueryWrapper.eq(DatabaseConsts.BookChapterTable.COLUMN_BOOK_ID, bookId); Long chapterTotal = bookChapterMapper.selectCount(chapterQueryWrapper); // 组装数据并返回 @@ -150,9 +150,9 @@ public class BookServiceImpl implements BookService { // 查询上一章信息并返回章节ID QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(DatabaseConsts.BookChapterTable.ColumnEnum.BOOK_ID.getName(), bookId) - .lt(DatabaseConsts.BookChapterTable.ColumnEnum.CHAPTER_NUM.getName(), chapterNum) - .orderByDesc(DatabaseConsts.BookChapterTable.ColumnEnum.CHAPTER_NUM.getName()) + queryWrapper.eq(DatabaseConsts.BookChapterTable.COLUMN_BOOK_ID, bookId) + .lt(DatabaseConsts.BookChapterTable.COLUMN_CHAPTER_NUM, chapterNum) + .orderByDesc(DatabaseConsts.BookChapterTable.COLUMN_CHAPTER_NUM) .last(DatabaseConsts.SqlEnum.LIMIT_1.getSql()); return RestResp.ok( Optional.ofNullable(bookChapterMapper.selectOne(queryWrapper)) @@ -170,9 +170,9 @@ public class BookServiceImpl implements BookService { // 查询下一章信息并返回章节ID QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(DatabaseConsts.BookChapterTable.ColumnEnum.BOOK_ID.getName(), bookId) - .gt(DatabaseConsts.BookChapterTable.ColumnEnum.CHAPTER_NUM.getName(), chapterNum) - .orderByAsc(DatabaseConsts.BookChapterTable.ColumnEnum.CHAPTER_NUM.getName()) + queryWrapper.eq(DatabaseConsts.BookChapterTable.COLUMN_BOOK_ID, bookId) + .gt(DatabaseConsts.BookChapterTable.COLUMN_CHAPTER_NUM, chapterNum) + .orderByAsc(DatabaseConsts.BookChapterTable.COLUMN_CHAPTER_NUM) .last(DatabaseConsts.SqlEnum.LIMIT_1.getSql()); return RestResp.ok( Optional.ofNullable(bookChapterMapper.selectOne(queryWrapper)) @@ -184,8 +184,8 @@ public class BookServiceImpl implements BookService { @Override public RestResp> listChapters(Long bookId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(DatabaseConsts.BookChapterTable.ColumnEnum.BOOK_ID.getName(), bookId) - .orderByAsc(DatabaseConsts.BookChapterTable.ColumnEnum.CHAPTER_NUM.getName()); + queryWrapper.eq(DatabaseConsts.BookChapterTable.COLUMN_BOOK_ID, bookId) + .orderByAsc(DatabaseConsts.BookChapterTable.COLUMN_CHAPTER_NUM); return RestResp.ok(bookChapterMapper.selectList(queryWrapper).stream().map(v -> BookChapterRespDto.builder() .id(v.getId()) .chapterName(v.getChapterName()) diff --git a/src/main/java/io/github/xxyopen/novel/service/impl/NewsServiceImpl.java b/src/main/java/io/github/xxyopen/novel/service/impl/NewsServiceImpl.java index cf2819f..1d41067 100644 --- a/src/main/java/io/github/xxyopen/novel/service/impl/NewsServiceImpl.java +++ b/src/main/java/io/github/xxyopen/novel/service/impl/NewsServiceImpl.java @@ -40,7 +40,7 @@ public class NewsServiceImpl implements NewsService { public RestResp getNews(Long id) { NewsInfo newsInfo = newsInfoMapper.selectById(id); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(DatabaseConsts.NewsContentTable.ColumnEnum.NEWS_ID.getName(), id) + queryWrapper.eq(DatabaseConsts.NewsContentTable.COLUMN_NEWS_ID, id) .last(DatabaseConsts.SqlEnum.LIMIT_1.getSql()); NewsContent newsContent = newsContentMapper.selectOne(queryWrapper); return RestResp.ok(NewsInfoRespDto.builder() diff --git a/src/main/java/io/github/xxyopen/novel/service/impl/UserServiceImpl.java b/src/main/java/io/github/xxyopen/novel/service/impl/UserServiceImpl.java index 33ac948..728804c 100644 --- a/src/main/java/io/github/xxyopen/novel/service/impl/UserServiceImpl.java +++ b/src/main/java/io/github/xxyopen/novel/service/impl/UserServiceImpl.java @@ -53,8 +53,7 @@ public class UserServiceImpl implements UserService { // 校验手机号是否已注册 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(DatabaseConsts.UserInfoTable.ColumnEnum.USERNAME.getName() - , dto.getUsername()) + queryWrapper.eq(DatabaseConsts.UserInfoTable.COLUMN_USERNAME, dto.getUsername()) .last(DatabaseConsts.SqlEnum.LIMIT_1.getSql()); if (userInfoMapper.selectCount(queryWrapper) > 0) { // 手机号已注册 @@ -82,8 +81,7 @@ public class UserServiceImpl implements UserService { public RestResp login(UserLoginReqDto dto) { // 查询用户信息 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(DatabaseConsts.UserInfoTable.ColumnEnum.USERNAME.getName() - , dto.getUsername()) + queryWrapper.eq(DatabaseConsts.UserInfoTable.COLUMN_USERNAME, dto.getUsername()) .last(DatabaseConsts.SqlEnum.LIMIT_1.getSql()); UserInfo userInfo = userInfoMapper.selectOne(queryWrapper); if (Objects.isNull(userInfo)) {