1、mp配置分页插件修改

2、英语模块查询英语列表查询条件修改

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

@@ -21,7 +21,9 @@ public class MybatisPlusConfig {
     @Bean
     public MybatisPlusInterceptor 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;
     }
 }

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

@@ -1,6 +1,7 @@
 package com.xjs.word.service.impl;
 
 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.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -50,10 +51,10 @@ public class EnglishWordServiceImpl extends ServiceImpl<EnglishWordMapper, Engli
 
     @Override
     public IPage<EnglishWord> getEnglishWordByCollect(Page<EnglishWord> page) {
-        QueryWrapper<EnglishWord> wr = new QueryWrapper<EnglishWord>()
-                .eq("is_collect", COLLECT)
-                .orderByDesc("top")
-                .orderByDesc("create_time");
+        LambdaQueryWrapper<EnglishWord> wr = new LambdaQueryWrapper<EnglishWord>()
+                .eq(EnglishWord::getIsCollect, COLLECT)
+                .orderByDesc(EnglishWord::getTop)
+                .orderByDesc(EnglishWord::getCreateTime);
 
         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) {
         String condition = englishWord.getCondition();
 
-        QueryWrapper<EnglishWord> wr = new QueryWrapper<>();
+        LambdaQueryWrapper<EnglishWord> wr = new LambdaQueryWrapper<>();
         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);

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

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