diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java index b7d50bf..8903bac 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java @@ -1,5 +1,6 @@ package cc.smtweb.framework.core.common; +import cc.smtweb.framework.core.util.NumberUtil; import cc.smtweb.framework.core.util.PubUtil; import org.apache.commons.lang3.StringUtils; @@ -174,11 +175,11 @@ public interface SwEnum { if (dataType == null) return fieldValue; switch (dataType.javaType) { case JAVA_TYPE_LONG: - return PubUtil.getLongIgnoreErr(fieldValue); + return NumberUtil.getLongIgnoreErr(fieldValue); case JAVA_TYPE_INT: - return PubUtil.getIntIgnoreErr(fieldValue); + return NumberUtil.getIntIgnoreErr(fieldValue); case JAVA_TYPE_BOOL: - return PubUtil.getBool(fieldValue); + return NumberUtil.getBoolValue(fieldValue); default: return fieldValue; } diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/ListSQLParaHelper.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/ListSQLParaHelper.java index 1a1fcd9..c961e9d 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/ListSQLParaHelper.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/ListSQLParaHelper.java @@ -14,6 +14,7 @@ import java.util.List; * @version : $Revision:$ */ @SuppressWarnings("UnusedDeclaration") +@Deprecated public abstract class ListSQLParaHelper { diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/MathUtil.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/MathUtil.java index 3e17961..de803f1 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/MathUtil.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/MathUtil.java @@ -10,6 +10,7 @@ import java.text.DecimalFormat; * Date: 12-12-25 下午1:02 * To change this template use File | Settings | File Templates. */ +@Deprecated public class MathUtil { //整数 private static DecimalFormat dfLng = new DecimalFormat("##############0"); diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/NumberUtil.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/NumberUtil.java index 003586a..00b7e4b 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/NumberUtil.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/NumberUtil.java @@ -12,7 +12,8 @@ import java.text.DecimalFormat; import java.util.Map; public class NumberUtil { - private NumberUtil() {} + private NumberUtil() { + } //整数 private static DecimalFormat dfLng = new DecimalFormat("##############0"); @@ -271,7 +272,7 @@ public class NumberUtil { */ public static String toStdNumberString(double d, boolean isZeroToEmpty) { if (isEqualsZero(d)) { - return isZeroToEmpty ? "" : "0.00"; + return isZeroToEmpty ? "": "0.00"; } return stdNumberFormat.format(d); } @@ -304,7 +305,7 @@ public class NumberUtil { */ public static String toStdPercentNumberStr(double d, boolean isZeroToEmpty) { if (d > -0.00000000001 && d < 0.00000000001) { - return isZeroToEmpty ? "" : "0.00%"; + return isZeroToEmpty ? "": "0.00%"; } return toStdNumberString(d * 100) + "%"; } @@ -323,7 +324,7 @@ public class NumberUtil { */ public static String toStdAmountString(double d, boolean isZeroToEmpty) { if (isEqualsZero(d)) { - return isZeroToEmpty ? "" : "0.00"; + return isZeroToEmpty ? "": "0.00"; } return stdAmountFormat.format(d); } @@ -410,15 +411,15 @@ public class NumberUtil { public static double chkDbNull(Double v) { - return v == null ? 0 : v; + return v == null ? 0: v; } public static double max(double d1, double d2) { - return compare(d1, d2) < 0 ? d2 : d1; + return compare(d1, d2) < 0 ? d2: d1; } public static double min(double d1, double d2) { - return compare(d1, d2) < 0 ? d1 : d2; + return compare(d1, d2) < 0 ? d1: d2; } /** @@ -465,6 +466,14 @@ public class NumberUtil { } } + public static int getBoolValue(String s) { + String value = s.toLowerCase(); + if ("true".equalsIgnoreCase(value) || "1".equals(value) || "y".equalsIgnoreCase(value)) { + return 1; + } + return 0; + } + /** * 计算公式 参数以Map方式传入 * @@ -523,13 +532,13 @@ public class NumberUtil { public static boolean calcExprMapBool(String expr, Map mapVar) { Object o = calcExprMapObject(expr, mapVar); - if (o != null) return (Boolean)o; + if (o != null) return (Boolean) o; return false; } public static boolean calcExprBoolEx(String expr, Object... vars) { Object o = calcExprObjectEx(expr, vars); - if (o != null) return (Boolean)o; + if (o != null) return (Boolean) o; return false; } diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/PubUtil.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/PubUtil.java index 0636910..2aaa1a5 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/PubUtil.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/PubUtil.java @@ -23,6 +23,7 @@ import java.util.regex.Pattern; */ @SuppressWarnings("UnusedDeclaration") @Slf4j +@Deprecated public class PubUtil { private static SimpleDateFormat dFormat = new SimpleDateFormat("yyyy-MM-dd"); private static SimpleDateFormat tFormat = new SimpleDateFormat("HH:mm:ss");