From d6a058720cbe646c955e221205ced99eba781fe0 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Sat, 26 Feb 2022 22:29:03 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81mp=E9=85=8D=E7=BD=AE=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=8F=92=E4=BB=B6=E4=BF=AE=E6=94=B9=202=E3=80=81?=
 =?UTF-8?q?=E8=8B=B1=E8=AF=AD=E6=A8=A1=E5=9D=97=E6=9F=A5=E8=AF=A2=E8=8B=B1?=
 =?UTF-8?q?=E8=AF=AD=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xjs/config/MybatisPlusConfig.java |  4 +++-
 .../word/service/impl/EnglishWordServiceImpl.java   | 13 +++++++------
 .../com/xjs/time/controller/TimeController.java     |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

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
index f984bbdb..21d4df1d 100644
--- 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
@@ -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;
     }
 }
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 cef98d6d..1c38390d 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,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);
diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/time/controller/TimeController.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/time/controller/TimeController.java
index 364e24c3..4acbb796 100644
--- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/time/controller/TimeController.java
+++ b/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());
     }