From 0b2edf481723fa652a5fd4677466112e9b19e031 Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Fri, 31 Dec 2021 09:59:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=9A1=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9Emybatisplus=E5=88=86=E9=A1=B5=E6=8F=92=E4=BB=B6=20=20?= =?UTF-8?q?=20=20=20=202=E3=80=81=E6=96=B0=E5=A2=9E=E9=80=9A=E7=94=A8contr?= =?UTF-8?q?oller=E5=B0=81=E8=A3=85mp=E5=88=86=E9=A1=B5=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=20=20=20=20=20=203=E3=80=81=E8=8B=B1=E8=AF=AD=E5=8D=95?= =?UTF-8?q?=E8=AF=8D=E6=94=B6=E8=97=8F=E5=A4=B9=E5=90=8E=E7=AB=AF=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/redis/service/RedisService.java | 2 +- .../com/xjs/config/MybatisPlusConfig.java | 27 +++++++++++++++ .../java/com/xjs/consts/EnglishWordConst.java | 23 +++++++++++++ .../java/com/xjs/web/MyBaseController.java | 33 +++++++++++++++++++ .../controller/EnglishWordController.java | 11 ++++--- .../xjs/word/service/IEnglishWordService.java | 4 ++- .../service/impl/EnglishWordServiceImpl.java | 12 +++++-- 7 files changed, 103 insertions(+), 9 deletions(-) create mode 100644 xjs-business/xjs-business-common/src/main/java/com/xjs/config/MybatisPlusConfig.java create mode 100644 xjs-business/xjs-business-common/src/main/java/com/xjs/consts/EnglishWordConst.java create mode 100644 xjs-business/xjs-business-common/src/main/java/com/xjs/web/MyBaseController.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java index bf6624eb..6ae71fec 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java @@ -233,7 +233,7 @@ public class RedisService { /** * 删hash集合某个元素 - * + * @author xjs * @param key redis键 * @param hkey hash键 */ diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/MybatisPlusConfig.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/MybatisPlusConfig.java new file mode 100644 index 00000000..bc1b24ab --- /dev/null +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/MybatisPlusConfig.java @@ -0,0 +1,27 @@ +package com.xjs.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * @author xiejs + * @desc + * @create 2021-12-31 + */ +@Configuration +public class MybatisPlusConfig { + + /** + * mysql分页插件 + * @return MybatisPlusInterceptor + */ + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + return interceptor; + } +} diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/consts/EnglishWordConst.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/consts/EnglishWordConst.java new file mode 100644 index 00000000..5052ad15 --- /dev/null +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/consts/EnglishWordConst.java @@ -0,0 +1,23 @@ +package com.xjs.consts; + +/** + * @author xiejs + * @desc 英语单词常量类 + * @create 2021-12-31 + */ +public class EnglishWordConst { + + //置顶 + public static final Integer TOP = 1; + + //不置顶 + public static final Integer NO_TOP = 2; + + //收藏 + public static final Integer COLLECT = 1; + + //不收藏 + public static final Integer NO_COLLECT = 2; + + +} diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/web/MyBaseController.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/web/MyBaseController.java new file mode 100644 index 00000000..0cc84ade --- /dev/null +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/web/MyBaseController.java @@ -0,0 +1,33 @@ +package com.xjs.web; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.page.PageDomain; +import com.ruoyi.common.core.web.page.TableSupport; + +/** + * @author xiejs + * @desc 自定义通用controller + * @create 2021-12-31 + */ +public class MyBaseController extends BaseController { + + /** + * mp分页封装 + * @return Page + */ + protected Page startPageMP( ){ + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + Page page = new Page<>(); + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) + { + page.setSize(pageSize); + page.setCurrent(pageNum); + } + return page; + } + +} diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java index d81d7fce..d34ecfee 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java @@ -1,7 +1,7 @@ package com.xjs.word.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.log.annotation.Log; @@ -9,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.xjs.validation.AddGroup; import com.xjs.validation.UpdateGroup; +import com.xjs.web.MyBaseController; import com.xjs.word.domain.EnglishWord; import com.xjs.word.service.IEnglishWordService; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +27,7 @@ import java.util.List; */ @RestController @RequestMapping("/word") -public class EnglishWordController extends BaseController { +public class EnglishWordController extends MyBaseController { @Autowired private IEnglishWordService englishWordService; @@ -37,9 +38,9 @@ public class EnglishWordController extends BaseController { */ @RequiresPermissions("english:word:collect") @GetMapping("collect") - public TableDataInfo collect() { - List englishWordList=englishWordService.getEnglishWordByCollect(); - return getDataTable(englishWordList); + public AjaxResult collect() { + IPage englishWordList=englishWordService.getEnglishWordByCollect(startPageMP()); + return AjaxResult.success(englishWordList); } diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/IEnglishWordService.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/IEnglishWordService.java index 645d0d6f..6a80abb4 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/IEnglishWordService.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/IEnglishWordService.java @@ -1,5 +1,7 @@ package com.xjs.word.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.xjs.word.domain.EnglishWord; import java.util.List; @@ -16,7 +18,7 @@ public interface IEnglishWordService { * 查询收藏的单词列表 * @return */ - List getEnglishWordByCollect(); + IPage getEnglishWordByCollect(Page page); /** * 查询英语单词 diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java index 196fd338..2fc96774 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java @@ -1,5 +1,8 @@ package com.xjs.word.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.redis.service.RedisService; @@ -19,6 +22,7 @@ import javax.annotation.Resource; import java.util.*; import java.util.concurrent.TimeUnit; +import static com.xjs.consts.EnglishWordConst.COLLECT; import static com.xjs.consts.RedisConst.TRAN_DICT; import static com.xjs.consts.RedisConst.TRAN_DICT_EXPIRE; @@ -42,8 +46,12 @@ public class EnglishWordServiceImpl implements IEnglishWordService { @Override - public List getEnglishWordByCollect() { - return null; + public IPage getEnglishWordByCollect(Page page) { + QueryWrapper wr = new QueryWrapper() + .eq("is_collect", COLLECT) + .orderByDesc("top") + .orderByDesc("create_time"); + return englishWordMapper.selectPage(page,wr); } /**