说明：1、新增mybatisplus分页插件
2、新增通用controller封装mp分页操作
3、英语单词收藏夹后端实现分页
This commit is contained in:
xjs
parent
460f7c242f
commit
0b2edf4817
|
|
@ -233,7 +233,7 @@ public class RedisService {
|
|||
|
||||
/**
|
||||
* 删hash集合某个元素
|
||||
*
|
||||
* @author xjs
|
||||
* @param key redis键
|
||||
* @param hkey hash键
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -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<EnglishWord> englishWordList=englishWordService.getEnglishWordByCollect();
|
||||
return getDataTable(englishWordList);
|
||||
public AjaxResult collect() {
|
||||
IPage<EnglishWord> englishWordList=englishWordService.getEnglishWordByCollect(startPageMP());
|
||||
return AjaxResult.success(englishWordList);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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<EnglishWord> getEnglishWordByCollect();
|
||||
IPage<EnglishWord> getEnglishWordByCollect(Page<EnglishWord> page);
|
||||
|
||||
/**
|
||||
* 查询英语单词
|
||||
|
|
|
|||
|
|
@ -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<EnglishWord> getEnglishWordByCollect() {
|
||||
return null;
|
||||
public IPage<EnglishWord> getEnglishWordByCollect(Page<EnglishWord> page) {
|
||||
QueryWrapper<EnglishWord> wr = new QueryWrapper<EnglishWord>()
|
||||
.eq("is_collect", COLLECT)
|
||||
.orderByDesc("top")
|
||||
.orderByDesc("create_time");
|
||||
return englishWordMapper.selectPage(page,wr);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue