From 5f3da432874c19e17c7c5caaf044f714bbe851a3 Mon Sep 17 00:00:00 2001
From: 吴学文 <wuxuewen@wuxuewendeMacBook-Pro.local>
Date: 星期日, 14 四月 2019 00:25:11 +0800
Subject: [PATCH] 调整文档首页

---
 java110-common/src/main/java/com/java110/common/util/Assert.java |   96 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/java110-common/src/main/java/com/java110/common/util/Assert.java b/java110-common/src/main/java/com/java110/common/util/Assert.java
index ce41fe7..d1e8ae8 100644
--- a/java110-common/src/main/java/com/java110/common/util/Assert.java
+++ b/java110-common/src/main/java/com/java110/common/util/Assert.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -18,8 +19,8 @@
      * @param key
      * @param message
      */
-    public static void isNull(JSONObject jsonObject,String key,String message){
-        Assert.isNull(jsonObject,message);
+    public static void isNotNull(Map jsonObject,String key,String message){
+        Assert.notEmpty(jsonObject,message);
 
         if(!jsonObject.containsKey(key)){
             throw new IllegalArgumentException(message) ;
@@ -27,15 +28,64 @@
     }
 
     /**
+     * 鍒ゆ柇 jsonObject 鏄惁涓虹┖
+     * @param jsonObject
+     * @param key
+     * @param message
+     */
+    public static void jsonObjectHaveKey(JSONObject jsonObject,String key,String message){
+        isNotNull(jsonObject,key,message);
+    }
+
+
+
+
+    /**
+     * 鍒ゆ柇 jsonObject 鏄惁涓虹┖
+     * @param jsonStr
+     * @param key
+     * @param message
+     */
+    public static void jsonObjectHaveKey(String jsonStr,String key,String message){
+        Assert.hasLength(jsonStr,"涓嶆槸鏈夋晥鐨刯son涓虹┖,"+message);
+        if(isJsonObject(jsonStr)) {
+            JSONObject jsonObject = JSONObject.parseObject(jsonStr);
+            isNotNull(jsonObject, key, message);
+        }else{
+            throw new IllegalArgumentException(message);
+        }
+    }
+
+    /**
+     * 鍒ゆ柇 jsonObject 鏄惁涓虹┖
+     * @param info
+     * @param key
+     * @param message
+     */
+    public static void hasKey(Map info,String key,String message){
+        isNotNull(info,key,message);
+    }
+
+    /**
+     * 鍒ゆ柇 jsonObject 鏄惁涓虹┖
+     * @param info
+     * @param key
+     * @param message
+     */
+    public static void hasKeyAndValue(Map info,String key,String message){
+        isNotNull(info,key,message);
+        hasLength(info.get(key)== null?"":info.get(key).toString(),message);
+    }
+
+
+    /**
      * 鍒ゆ柇json鏄惁涓虹┖
      * @param jsonArray
      * @param message
      */
-    public static void isNull(JSONArray jsonArray,String message){
+    public static void listIsNull(List jsonArray,String message){
 
-        Assert.isNull(jsonArray,message);
-
-        if(jsonArray.size() < 1 ){
+        if(jsonArray != null && jsonArray.size() > 0 ){
             throw new IllegalArgumentException(message) ;
         }
     }
@@ -45,9 +95,9 @@
      * @param targetList
      * @param message
      */
-    public static void isNull(List<?> targetList , String message){
+    public static void isNotNull(List<?> targetList , String message){
 
-        Assert.isNull(targetList,message);
+        Assert.notNull(targetList,message);
 
         if(targetList.size()< 1){
             throw new IllegalArgumentException(message) ;
@@ -82,6 +132,17 @@
     }
 
     /**
+     * 鍒ゆ柇 jsonObject 鏄惁涓虹┖
+     * @param strValue
+     * @param message
+     */
+    public static void isJsonObject(String strValue,String message){
+        if(!isJsonObject(strValue)){
+            throw new IllegalArgumentException(message);
+        }
+    }
+
+    /**
      * 鏍￠獙鏄惁涓篔SON
      * @param msg
      * @return
@@ -106,4 +167,23 @@
         }
         return true;
     }
+
+    /**
+     * 鏍￠獙鏄惁涓烘暣鏁�
+     * @param text
+     * @param msg
+     */
+    public static void isInteger(String text,String msg){
+        if(!StringUtils.isNumeric(text)){
+            throw new IllegalArgumentException(msg);
+        }
+    }
+
+    public static void isDate(String text,String msg){
+        try{
+            DateUtil.getDefaultDateFromString(text);
+        }catch (Exception e){
+            throw new IllegalArgumentException(msg);
+        }
+    }
 }

--
Gitblit v1.8.0