一波更新,调整 Page 的两个方法名,以致可以 json 化,逻辑删除的与未删除的默认值交换一下

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/config/GlobalConfig.java

@@ -131,13 +131,13 @@ public class GlobalConfig implements Serializable {
          */
         private IKeyGenerator keyGenerator;
         /**
-         * 逻辑删除全局值（默认 0、否）
+         * 逻辑删除全局值（默认 1、表示已删除）
          */
-        private String logicDeleteValue = "0";
+        private String logicDeleteValue = "1";
         /**
-         * 逻辑未删除全局值（默认 1、是）
+         * 逻辑未删除全局值（默认 0、表示未删除）
          */
-        private String logicNotDeleteValue = "1";
+        private String logicNotDeleteValue = "0";
         /**
          * 字段验证策略
          */
@@ -146,6 +146,5 @@ public class GlobalConfig implements Serializable {
          * Sql 保留字处理器
          */
         private SqlReservedWordsHandler reservedWordsHandler = SqlReservedWordsHandler.getInstance();
-
     }
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/Page.java

@@ -95,23 +95,23 @@ public class Page<T> implements IPage<T>, Serializable {
 
     /**
      * <p>
-     * 存在上一页
+     * 是否存在上一页
      * </p>
      *
      * @return true / false
      */
-    public boolean hasPrevious() {
+    public boolean isHasPrevious() {
         return this.current > 1;
     }
 
     /**
      * <p>
-     * 存在下一页
+     * 是否存在下一页
      * </p>
      *
      * @return true / false
      */
-    public boolean hasNext() {
+    public boolean isHasNext() {
         return this.current < this.getPages();
     }
 
@@ -126,6 +126,11 @@ public class Page<T> implements IPage<T>, Serializable {
         return this;
     }
 
+    @Override
+    public long getTotal() {
+        return this.total;
+    }
+
     @Override
     public Page<T> setTotal(long total) {
         this.total = total;
@@ -133,8 +138,8 @@ public class Page<T> implements IPage<T>, Serializable {
     }
 
     @Override
-    public long getTotal() {
-        return this.total;
+    public long getSize() {
+        return this.size;
     }
 
     @Override
@@ -144,8 +149,8 @@ public class Page<T> implements IPage<T>, Serializable {
     }
 
     @Override
-    public long getSize() {
-        return this.size;
+    public long getCurrent() {
+        return this.current;
     }
 
     @Override
@@ -154,11 +159,6 @@ public class Page<T> implements IPage<T>, Serializable {
         return this;
     }
 
-    @Override
-    public long getCurrent() {
-        return this.current;
-    }
-
     @Override
     public String[] ascs() {
         return ascs;

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/SqlTest.java

@@ -5,7 +5,6 @@ import org.junit.Test;
 public class SqlTest {
 
     @Test
-    public void test(){
-        System.out.println(String.format("%s LIKE CONCAT('%%',#{%s},'%%')", "column", "value"));
+    public void test() {
     }
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/entity/LogicTestData.java

@@ -1,13 +1,18 @@
 package com.baomidou.mybatisplus.test.base.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 /**
  * @author meimie
  * @since 2018/6/7
@@ -34,5 +39,5 @@ public class LogicTestData {
     private Boolean deleted;
 
     @Version
-    private Long version;
+    private Integer version;
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/entity/TestData.java

@@ -7,6 +7,7 @@ import java.time.LocalTime;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -33,4 +34,7 @@ public class TestData {
     private LocalDateTime createDatetime;
     @TableField(fill = FieldFill.UPDATE)
     private LocalDateTime updateDatetime;
+
+    @Version
+    private Integer version;
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MysqlTestDataMapperTest.java

@@ -62,7 +62,7 @@ public class MysqlTestDataMapperTest {
         LocalDateTime nowDateTime = LocalDateTime.now();
         LocalDate nowDate = nowDateTime.toLocalDate();
         LocalTime nowTime = nowDateTime.toLocalTime();
-        for (int i = 0; i < 1; i++) {
+        for (int i = 0; i < 20; i++) {
             mapper.insert(new TestData().setTestInt(i).setTestStr(String.format("第%s条数据", i))
                 .setTestDouble(BigDecimal.valueOf(3.3).multiply(BigDecimal.valueOf(i)).doubleValue())
                 .setTestBoolean((i + 3) % 2 == 0).setTestDate(nowDate)
@@ -112,7 +112,7 @@ public class MysqlTestDataMapperTest {
         LogicTestData et = new LogicTestData()
             .setId(1019248035919613954L)
             .setTestInt(9991122)
-            .setVersion(19L);
+            .setVersion(19);
         System.out.println("====1=====>>>" + JSON.toJSONString(et, true));
         boolean r = logicTestDataService.saveOrUpdate(et);
         System.out.println("====2-1==r==>>>" + r);
@@ -125,7 +125,7 @@ public class MysqlTestDataMapperTest {
         LogicTestData et = new LogicTestData()
             .setId(1019248035919613954L)
             .setTestInt(999)
-            .setVersion(17L);
+            .setVersion(17);
         System.out.println("====1=====>>>" + JSON.toJSONString(et, true));
         int r = logicMapper.updateById(et);
         System.out.println("====2-1==r==>>>" + r);
@@ -246,21 +246,21 @@ public class MysqlTestDataMapperTest {
     public void selectPage() {
         IPage<TestData> page = new Page<>();
         page.setSize(5).setCurrent(1);
-        IPage<TestData> dataPage = mapper.selectPage(page, new QueryWrapper<TestData>().lambda()
-            .eq(TestData::getTestInt, 5));
+        IPage<TestData> dataPage = mapper.selectPage(page, null);
         Assert.assertSame(dataPage, page);
         System.out.println(String.format("total = {%s}", dataPage.getTotal()));
         System.out.println(String.format("data.size = {%s}", dataPage.getRecords().size()));
         println(page.getRecords());
+        System.out.println(JSON.toJSONString(page));
 
         IPage<LogicTestData> logicPage = new Page<>();
         logicPage.setSize(5).setCurrent(1);
-        IPage<LogicTestData> logicDataPage = logicMapper.selectPage(logicPage, new QueryWrapper<LogicTestData>().lambda()
-            .eq(LogicTestData::getTestInt, 5));
+        IPage<LogicTestData> logicDataPage = logicMapper.selectPage(logicPage, null);
         Assert.assertSame(logicDataPage, logicPage);
         System.out.println(String.format("total = {%s}", logicDataPage.getTotal()));
         System.out.println(String.format("data.size = {%s}", logicDataPage.getRecords().size()));
         println(logicDataPage.getRecords());
+        System.out.println(JSON.toJSONString(logicDataPage));
 
     }
 

mybatis-plus/src/test/resources/mysql/test_data.ddl.sql

@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS tb_test_data_logic (
     create_datetime datetime,
     update_datetime datetime,
     deleted         tinyint(1) default 0,
-    version        BIGINT default 0
+    version        integer default 0
 )
     ENGINE = innodb
     DEFAULT CHARSET = utf8;
@@ -28,7 +28,7 @@ CREATE TABLE IF NOT EXISTS tb_test_data (
     test_timestamp  timestamp,
     create_datetime datetime,
     update_datetime datetime,
-    version        BIGINT default 0
+    version        integer default 0
 )
     ENGINE = innodb
     DEFAULT CHARSET = utf8;