From 28c9d9bac4df3dfc10467befdc377b60e29d4031 Mon Sep 17 00:00:00 2001
From: wuxw7 <wuxw7@asiainfo.com>
Date: 星期日, 25 十一月 2018 00:28:40 +0800
Subject: [PATCH] 添加api 脚本

---
 java110-common/src/main/java/com/java110/common/util/Assert.java |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 53 insertions(+), 1 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 92b3e48..cc4c261 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
@@ -19,7 +19,7 @@
      * @param key
      * @param message
      */
-    public static void isNotNull(JSONObject jsonObject,String key,String message){
+    public static void isNotNull(Map jsonObject,String key,String message){
         Assert.notEmpty(jsonObject,message);
 
         if(!jsonObject.containsKey(key)){
@@ -36,6 +36,47 @@
     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鏄惁涓虹┖
@@ -93,6 +134,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

--
Gitblit v1.8.0