From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/java/com/moral/common/util/StringUtils.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/common/util/StringUtils.java b/src/main/java/com/moral/common/util/StringUtils.java
index 80635bf..b8b19d3 100644
--- a/src/main/java/com/moral/common/util/StringUtils.java
+++ b/src/main/java/com/moral/common/util/StringUtils.java
@@ -1,11 +1,25 @@
 package com.moral.common.util;
 
+import com.mysql.jdbc.TimeUtil;
+
+import javax.validation.constraints.NotNull;
+
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import org.apache.commons.lang3.Conversion;
+
+/**
+ *
+ * ������������: string ���������
+ * @author: fengxiang
+ * @date: 2018/7/30 10:53
+ */
 public class StringUtils {
 	public static final char UNDERLINE = '_';
+	public static final String NULL = "null";
 
     /**
      * ������������������������������������������������������
@@ -44,7 +58,7 @@
         return sb.toString();
     }
 	public static boolean isNullOrEmpty(String toTest) {
-		return toTest == null || toTest.length() == 0;
+		return toTest == null || toTest.length() == 0 || NULL.equals(toTest);
 	}
 	public static Object stringToObject4Type(Class<?> type,String value) throws Exception{
 		Object result = value;
@@ -134,11 +148,16 @@
 	}
 	public static boolean isNumericZidai(String str) {
 		for (int i = 0; i < str.length(); i++) {
-			System.out.println(str.charAt(i));
+			//System.out.println(str.charAt(i));
 			if (!Character.isDigit(str.charAt(i))) {
 				return false;
 			}
 		}
 		return true;
 	}
+
+	public static String scientificCountingConversion(String str){
+        BigDecimal db = new BigDecimal(str);
+        return db.toPlainString();
+    }
 }

--
Gitblit v1.8.0