diff --git a/pom.xml b/pom.xml
index 252034e..819d8b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.imyeyu.java
timi-java
- 0.0.6
+ 0.0.7
jar
diff --git a/src/main/java/com/imyeyu/java/TimiJava.java b/src/main/java/com/imyeyu/java/TimiJava.java
index 8982221..826fb1e 100644
--- a/src/main/java/com/imyeyu/java/TimiJava.java
+++ b/src/main/java/com/imyeyu/java/TimiJava.java
@@ -5,7 +5,6 @@ import java.io.StringWriter;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import java.util.Objects;
/**
* 通用工具
@@ -81,6 +80,15 @@ public interface TimiJava {
return false;
}
+ static boolean allEmpty(Object... objects) {
+ for (Object object : objects) {
+ if (isNotEmpty(object)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
static boolean allNotEmpty(Object... objects) {
for (Object object : objects) {
if (isEmpty(object)) {
@@ -105,7 +113,7 @@ public interface TimiJava {
* @param 对象类型
*/
static T defaultIfNull(T obj, T defaultObj) {
- return Objects.requireNonNullElse(obj, defaultObj);
+ return obj != null ? obj : defaultObj;
}
/**
diff --git a/src/main/java/com/imyeyu/java/bean/BasePage.java b/src/main/java/com/imyeyu/java/bean/BasePage.java
index 778c081..d0d4353 100644
--- a/src/main/java/com/imyeyu/java/bean/BasePage.java
+++ b/src/main/java/com/imyeyu/java/bean/BasePage.java
@@ -30,4 +30,22 @@ public class BasePage {
public void next() {
index++;
}
+
+ /**
+ * 获取偏移量
+ *
+ * @return 偏移量
+ */
+ public long getOffset() {
+ return (long) index * size;
+ }
+
+ /**
+ * 获取限制数量
+ *
+ * @return 限制数量
+ */
+ public long getLimit() {
+ return size;
+ }
}