From 7f11b2d5f565415e4ed2a3fc0f6ea463f0091dfc Mon Sep 17 00:00:00 2001
From: James <jfinal@126.com>
Date: Sun, 10 Apr 2022 20:57:36 +0800
Subject: [PATCH] =?UTF-8?q?get=20=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=20getBigDecimal=20=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/jfinal/kit/Okv.java | 33 +++++++++++++++++----------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/jfinal/kit/Okv.java b/src/main/java/com/jfinal/kit/Okv.java
index b46074e1..5bc033fc 100644
--- a/src/main/java/com/jfinal/kit/Okv.java
+++ b/src/main/java/com/jfinal/kit/Okv.java
@@ -16,6 +16,7 @@
package com.jfinal.kit;
+import java.math.BigDecimal;
import java.util.LinkedHashMap;
import java.util.Map;
import com.jfinal.json.Json;
@@ -94,31 +95,39 @@ public class Okv extends LinkedHashMap {
}
public Integer getInt(Object key) {
- Number n = (Number)get(key);
- return n != null ? n.intValue() : null;
+ return TypeKit.toInt(get(key));
}
public Long getLong(Object key) {
- Number n = (Number)get(key);
- return n != null ? n.longValue() : null;
+ return TypeKit.toLong(get(key));
+ }
+
+ public BigDecimal getBigDecimal(Object key) {
+ return TypeKit.toBigDecimal(get(key));
}
public Double getDouble(Object key) {
- Number n = (Number)get(key);
- return n != null ? n.doubleValue() : null;
+ return TypeKit.toDouble(get(key));
}
public Float getFloat(Object key) {
- Number n = (Number)get(key);
- return n != null ? n.floatValue() : null;
+ return TypeKit.toFloat(get(key));
}
public Number getNumber(Object key) {
- return (Number)get(key);
+ return TypeKit.toNumber(get(key));
}
public Boolean getBoolean(Object key) {
- return (Boolean)get(key);
+ return TypeKit.toBoolean(get(key));
+ }
+
+ public java.util.Date getDate(Object key) {
+ return TypeKit.toDate(get(key));
+ }
+
+ public java.time.LocalDateTime getLocalDateTime(Object key) {
+ return TypeKit.toLocalDateTime(get(key));
}
/**
@@ -140,7 +149,7 @@ public class Okv extends LinkedHashMap {
*/
public boolean isTrue(Object key) {
Object value = get(key);
- return (value instanceof Boolean && ((Boolean)value == true));
+ return value != null && TypeKit.toBoolean(value);
}
/**
@@ -148,7 +157,7 @@ public class Okv extends LinkedHashMap {
*/
public boolean isFalse(Object key) {
Object value = get(key);
- return (value instanceof Boolean && ((Boolean)value == false));
+ return value != null && !TypeKit.toBoolean(value);
}
public String toJson() {
--
GitLab