From b9fa61737495a5818a90e15a7b399c9093d7a0ac Mon Sep 17 00:00:00 2001 From: Redkale <8730487+redkale@users.noreply.github.com> Date: Sun, 20 Sep 2020 17:00:03 +0800 Subject: [PATCH] --- src/org/redkale/source/Flipper.java | 10 +++++++--- src/org/redkale/util/Sheet.java | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/org/redkale/source/Flipper.java b/src/org/redkale/source/Flipper.java index be0555e55..01f6f8f05 100644 --- a/src/org/redkale/source/Flipper.java +++ b/src/org/redkale/source/Flipper.java @@ -6,6 +6,7 @@ package org.redkale.source; import java.io.Serializable; +import org.redkale.convert.ConvertColumn; import org.redkale.util.Comment; /** @@ -20,12 +21,15 @@ public final class Flipper implements Serializable, Cloneable { public static int DEFAULT_LIMIT = 20; - @Comment("每页多少行") - private int limit = DEFAULT_LIMIT; - + @ConvertColumn(index = 1) @Comment("记录行的偏移量,从0开始") private int offset = 0; + @ConvertColumn(index = 2) + @Comment("每页多少行") + private int limit = DEFAULT_LIMIT; + + @ConvertColumn(index = 3) @Comment("排序字段, 可多字段排序") private String sort = ""; diff --git a/src/org/redkale/util/Sheet.java b/src/org/redkale/util/Sheet.java index f05f803af..484a6bff0 100644 --- a/src/org/redkale/util/Sheet.java +++ b/src/org/redkale/util/Sheet.java @@ -8,6 +8,7 @@ package org.redkale.util; import java.util.*; import java.util.function.*; import java.util.stream.*; +import org.redkale.convert.ConvertColumn; /** * 页集合。 结构由一个total总数和一个List列表组合而成。 @@ -21,8 +22,10 @@ import java.util.stream.*; @SuppressWarnings("unchecked") public class Sheet implements java.io.Serializable, Iterable { + @ConvertColumn(index = 1) private long total = -1; + @ConvertColumn(index = 2) private Collection rows; public Sheet() { @@ -62,6 +65,7 @@ public class Sheet implements java.io.Serializable, Iterable { * * @return 是否为空 */ + @ConvertColumn(index = 3) public boolean isEmpty() { return this.rows == null || this.rows.isEmpty(); }