From 9febefd876464497d29c27fea94cb59ac539664e Mon Sep 17 00:00:00 2001
From: 吴学文 <wuxuewen@wuxuewendeMacBook-Pro.local>
Date: 星期六, 13 四月 2019 23:28:55 +0800
Subject: [PATCH] 修改保存商户目录地址bug
---
java110-common/src/main/java/com/java110/common/util/Assert.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 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 4fab358..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
@@ -38,6 +38,8 @@
}
+
+
/**
* 鍒ゆ柇 jsonObject 鏄惁涓虹┖
* @param jsonStr
@@ -64,17 +66,26 @@
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) ;
}
}
@@ -84,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) ;
@@ -118,6 +129,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);
+ }
}
/**
@@ -156,4 +178,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