From b784175e978b0fcfca8ca8bed7953ae4eacf49e8 Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期一, 02 九月 2019 20:18:58 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
java110-common/src/main/java/com/java110/common/util/Assert.java | 221 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 165 insertions(+), 56 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..368e93a 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
@@ -6,141 +6,205 @@
import java.util.List;
import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* 鑷畾涔� 鏂█
* Created by wuxw on 2017/4/22.
*/
-public class Assert extends org.springframework.util.Assert{
+public class Assert extends org.springframework.util.Assert {
/**
* 鍒ゆ柇 jsonObject 鏄惁涓虹┖
+ *
* @param jsonObject
* @param key
* @param message
*/
- public static void isNotNull(Map jsonObject,String key,String message){
- Assert.notEmpty(jsonObject,message);
+ public static void isNotNull(Map jsonObject, String key, String message) {
+ Assert.notEmpty(jsonObject, message);
- if(!jsonObject.containsKey(key)){
- throw new IllegalArgumentException(message) ;
- }
- }
-
- /**
- * 鍒ゆ柇 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{
+ if (!jsonObject.containsKey(key)) {
throw new IllegalArgumentException(message);
}
}
/**
* 鍒ゆ柇 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);
+ 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 != null && jsonArray.size() > 0) {
+ throw new IllegalArgumentException(message);
+ }
+ }
- if(jsonArray.size() < 1 ){
- throw new IllegalArgumentException(message) ;
+ /**
+ * 鍒ゆ柇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);
+ }
+ }
+
+
+ /**
+ * 鏁扮粍鍙湁涓�鏉℃暟鎹�
+ *
+ * @param jsonArray
+ * @param message
+ */
+ public static void listOnlyOne(List jsonArray, String message) {
+
+ Assert.notNull(jsonArray, message);
+
+ if (jsonArray.size() != 1) {
+ throw new IllegalArgumentException(message);
}
}
/**
* 鍒ゆ柇list 鏄惁涓虹┖
+ *
* @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) ;
+ if (targetList.size() < 1) {
+ throw new IllegalArgumentException(message);
}
}
/**
* 鍒ゆ柇鏄惁鍙湁涓�鏉¤褰曟暟鎹�
+ *
* @param targetList
* @param message
*/
- public static void isOne(List<?> targetList,String message){
- Assert.isNull(targetList,message);
+ public static void isOne(List<?> targetList, String message) {
+ Assert.isNull(targetList, message);
- if(targetList.size() != 1){
- throw new IllegalArgumentException(message) ;
+ if (targetList.size() != 1) {
+ throw new IllegalArgumentException(message);
}
}
/**
* 鏍￠獙map 涓槸鍚︽湁鍊�
+ *
* @param targetMap
* @param message
*/
- public static void hasSize(Map<?,?> targetMap, String message){
- Assert.isNull(targetMap,message);
+ public static void hasSize(Map<?, ?> targetMap, String message) {
+ Assert.isNull(targetMap, message);
- if(targetMap.size() < 1){
+ if (targetMap.size() < 1) {
throw new IllegalArgumentException(message);
}
}
/**
+ * 鍒ゆ柇 jsonObject 鏄惁涓虹┖
+ *
+ * @param strValue
+ * @param message
+ */
+ public static void isJsonObject(String strValue, String message) {
+ if (!isJsonObject(strValue)) {
+ throw new IllegalArgumentException(message);
+ }
+ }
+
+ /**
* 鏍￠獙鏄惁涓篔SON
+ *
* @param msg
* @return
*/
public static Boolean isJsonObject(String msg) {
- try{
+ try {
JSONObject.parseObject(msg);
- }catch (Exception e){
+ } catch (Exception e) {
return false;
}
return true;
}
- public static Boolean isPageJsonObject(String msg){
- try{
+ public static Boolean isPageJsonObject(String msg) {
+ try {
JSONObject jsonObject = JSONObject.parseObject(msg);
- if(!jsonObject.containsKey("meta") || !jsonObject.containsKey("param")){
+ if (!jsonObject.containsKey("meta") || !jsonObject.containsKey("param")) {
return false;
}
- }catch (Exception e){
+ } catch (Exception e) {
return false;
}
return true;
@@ -148,12 +212,57 @@
/**
* 鏍￠獙鏄惁涓烘暣鏁�
+ *
* @param text
* @param msg
*/
- public static void isInteger(String text,String msg){
- if(!StringUtils.isNumeric(text)){
+ 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);
+ }
+ }
+
+
+ /**
+ * 鍒ゆ柇瀛楃涓叉槸鍚︽槸閲戦
+ *
+ * @param str 閲戦瀛楃涓�
+ * @param msg 寮傚父鏃朵俊鎭�
+ */
+ public static void isMoney(String str, String msg) {
+ Pattern pattern = java.util.regex.Pattern.compile("^(([1-9]{1}\\d*)|([0]{1}))(\\.(\\d){0,2})?$"); // 鍒ゆ柇灏忔暟鐐瑰悗2浣嶇殑鏁板瓧鐨勬鍒欒〃杈惧紡
+ Matcher match = pattern.matcher(str);
+ if (!match.matches()) {
+ throw new IllegalArgumentException(msg);
+
+ }
+ }
+
+ /**
+ * 妫�楠屾槸鍚﹀湪 infos 涓瓨鍦� flowComponent 瀵瑰簲缁勪欢鐨刱ey
+ * @param infos
+ * @param flowComponent
+ * @param key
+ * @param message
+ */
+ public static void hasKeyByFlowData(JSONArray infos, String flowComponent, String key, String message){
+
+ for(int infoIndex = 0 ; infoIndex < infos.size() ; infoIndex ++){
+ JSONObject _info = infos.getJSONObject(infoIndex);
+ if(_info.containsKey(flowComponent) && _info.getString("flowComponent").equals(flowComponent)){
+ hasKeyAndValue(_info, key, message);
+ break;
+ }
+ }
+
+ }
+
}
--
Gitblit v1.8.0