From e36232928ba5b119c1917c86c6b2b1fa422c2260 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 22 四月 2019 18:03:57 +0800
Subject: [PATCH] 加入开发规范 未写完

---
 java110-common/src/main/java/com/java110/common/util/Assert.java |   72 +++++++++++++++++++++++++++++++++--
 1 files changed, 67 insertions(+), 5 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 abfc762..e862c60 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
@@ -37,6 +37,25 @@
         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
@@ -48,15 +67,39 @@
     }
 
     /**
+     * 鍒ゆ柇 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 != null && jsonArray.size() > 0 ){
+            throw new IllegalArgumentException(message) ;
+        }
+    }
 
-        if(jsonArray.size() < 1 ){
+    /**
+     * 鍒ゆ柇json鏄惁涓虹┖
+     * @param jsonArray
+     * @param message
+     */
+    public static void listNotNull(List jsonArray,String message){
+
+        Assert.notNull(jsonArray,message);
+
+        if(jsonArray.size()< 1){
             throw new IllegalArgumentException(message) ;
         }
     }
@@ -66,9 +109,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) ;
@@ -100,6 +143,17 @@
             throw new IllegalArgumentException(message);
         }
 
+    }
+
+    /**
+     * 鍒ゆ柇 jsonObject 鏄惁涓虹┖
+     * @param strValue
+     * @param message
+     */
+    public static void isJsonObject(String strValue,String message){
+        if(!isJsonObject(strValue)){
+            throw new IllegalArgumentException(message);
+        }
     }
 
     /**
@@ -138,4 +192,12 @@
             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