Pārlūkot izejas kodu

Page属性访问权限调整.

nieqiurong 11 mēneši atpakaļ
vecāks
revīzija
423a99bfbf

+ 10 - 0
changelog-temp.md

@@ -0,0 +1,10 @@
+- fix: 解决optimizeJoinOfCountSql反序列化不支持问题
+- fix: 解决Db工具类批量操作使用rewriteBatchedStatements=true返回值不准确
+- opt: Page属性访问调整为private,重写toString方法
+- feat: 增加deleteByIds空集合处理
+- feat: 重命名selectBatchIds方法为selectByIds
+- feat: 支持tableName与schema属性占位符配
+- feat: 代码生成器增加对虚拟列的属性获取
+- feat: 升级kotlin2.0.0
+- feat: 升级SpringBoot3.3.1
+- feat: 部分支持依赖升级更新

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

@@ -38,51 +38,51 @@ public class Page<T> implements IPage<T> {
     /**
      * 查询数据列表
      */
-    protected List<T> records = Collections.emptyList();
+    private List<T> records = Collections.emptyList();
 
     /**
      * 总数
      */
-    protected long total = 0;
+    private long total = 0;
     /**
      * 每页显示条数,默认 10
      */
-    protected long size = 10;
+    private long size = 10;
 
     /**
      * 当前页
      */
-    protected long current = 1;
+    private long current = 1;
 
     /**
      * 排序字段信息
      */
     @Setter
-    protected List<OrderItem> orders = new ArrayList<>();
+    private List<OrderItem> orders = new ArrayList<>();
 
     /**
      * 自动优化 COUNT SQL
      */
-    protected boolean optimizeCountSql = true;
+    private boolean optimizeCountSql = true;
     /**
      * 是否进行 count 查询
      */
-    protected boolean searchCount = true;
+    private boolean searchCount = true;
     /**
      * {@link #optimizeJoinOfCountSql()}
      */
     @Setter
-    protected boolean optimizeJoinOfCountSql = true;
+    private boolean optimizeJoinOfCountSql = true;
     /**
      * 单页分页条数限制
      */
     @Setter
-    protected Long maxLimit;
+    private Long maxLimit;
     /**
      * countId
      */
     @Setter
-    protected String countId;
+    private String countId;
 
     public Page() {
     }

+ 7 - 0
mybatis-plus-extension/src/test/kotlin/com/baomidou/mybatisplus/test/kotlin/ChainWrappersTest.kt

@@ -38,6 +38,13 @@ class ChainWrappersTest : BaseDbTest<UserMapper>() {
         Assertions.assertEquals(4, Db.ktQuery(User::class.java).eq(User::id, 2).one().roleId)
     }
 
+    @Test
+    fun testSetSql() {
+        Assertions.assertTrue(
+            ChainWrappers.ktUpdateChain(User::class.java).eq(User::id, 3).setSql("username = {0}", "haku").update()
+        );
+    }
+
     override fun tableDataSql(): String {
         return "insert into `sys_user`(id,username,role_id) values(1,'gozei',1),(2,'chocolate',2),(3,'sheep',1)"
     }

+ 5 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/PageTest.java

@@ -2,6 +2,7 @@ package com.baomidou.mybatisplus.test;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONB;
+import com.alibaba.fastjson2.JSONReader;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -139,7 +140,10 @@ class PageTest {
             objectMapper.readValue(objectMapper.writeValueAsString(source), tClass),
             gson.fromJson(gson.toJson(source), tClass),
             JSON.parseObject(JSON.toJSONString(source), tClass),
-            JSONB.parseObject(JSONB.toBytes(source), tClass),
+            // dubbo 反序列化下出现问题  https://github.com/alibaba/fastjson2/issues/2734
+//            JSONB.parseObject(JSONB.toBytes(source), tClass,
+//                JSONReader.Feature.FieldBased
+//            ),
             com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson.JSON.toJSONString(source), tClass)
         );
     }