clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、mp配置分页插件修改 

2、英语模块查询英语列表查询条件修改
This commit is contained in:
xjs 2022-02-26 22:29:03 +08:00
parent 10dc23317e
commit d6a058720c
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xjs-business/xjs-business-common/src/main/java/com/xjs/config/MybatisPlusConfig.java
View File

@ -21,7 +21,9 @@ public class MybatisPlusConfig {
@Bean @Bean
public MybatisPlusInterceptor mybatisPlusInterceptor() { public MybatisPlusInterceptor mybatisPlusInterceptor() {
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(DbType.MYSQL);
paginationInnerInterceptor.setMaxLimit(100L);//设置最大分页数
interceptor.addInnerInterceptor(paginationInnerInterceptor);
return interceptor; return interceptor;
} }
} }

13
xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.xjs.word.service.impl; package com.xjs.word.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -50,10 +51,10 @@ public class EnglishWordServiceImpl extends ServiceImpl<EnglishWordMapper, Engli
@Override @Override
public IPage<EnglishWord> getEnglishWordByCollect(Page<EnglishWord> page) { public IPage<EnglishWord> getEnglishWordByCollect(Page<EnglishWord> page) {
QueryWrapper<EnglishWord> wr = new QueryWrapper<EnglishWord>() LambdaQueryWrapper<EnglishWord> wr = new LambdaQueryWrapper<EnglishWord>()
.eq("is_collect", COLLECT) .eq(EnglishWord::getIsCollect, COLLECT)
.orderByDesc("top") .orderByDesc(EnglishWord::getTop)
.orderByDesc("create_time"); .orderByDesc(EnglishWord::getCreateTime);
return englishWordMapper.selectPage(page, wr); return englishWordMapper.selectPage(page, wr);
} }
@ -190,9 +191,9 @@ public class EnglishWordServiceImpl extends ServiceImpl<EnglishWordMapper, Engli
public IPage<EnglishWord> selectEnglishWordList(Page<EnglishWord> page, EnglishWord englishWord) { public IPage<EnglishWord> selectEnglishWordList(Page<EnglishWord> page, EnglishWord englishWord) {
String condition = englishWord.getCondition(); String condition = englishWord.getCondition();
QueryWrapper<EnglishWord> wr = new QueryWrapper<>(); LambdaQueryWrapper<EnglishWord> wr = new LambdaQueryWrapper<>();
wr.and(StringUtils.isNotEmpty(condition), obj -> { wr.and(StringUtils.isNotEmpty(condition), obj -> {
obj.like("english_word", condition).or().like("chinese_word", condition); obj.like(EnglishWord::getEnglishWord, condition).or().like(EnglishWord::getChineseWord, condition);
}); });
//wr.like("english_word", condition).or().like("chinese_word", condition); //wr.like("english_word", condition).or().like("chinese_word", condition);

4
xjs-business/xjs-business-openapi/src/main/java/com/xjs/time/controller/TimeController.java
View File

@ -29,13 +29,13 @@ public class TimeController {
@ApiOperation("获取网络时间") @ApiOperation("获取网络时间")
public AjaxResult getNetworkTime() { public AjaxResult getNetworkTime() {
String time = timeFactoryImpl.getTime(); String time = timeFactoryImpl.getTime();
return AjaxResult.success(time); return AjaxResult.success("操作成功",time);
} }
@GetMapping("serviceTime") @GetMapping("serviceTime")
@ApiOperation("获取服务器时间") @ApiOperation("获取服务器时间")
public AjaxResult getServiceTime() { public AjaxResult getServiceTime() {
return AjaxResult.success(DateUtil.now()); return AjaxResult.success("操作成功",DateUtil.now());
} }