From 7935724516cb699835da888d59cd5b7bec5c6049 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 九月 2024 12:07:29 +0800
Subject: [PATCH] 完成业主功能的优化
---
java110-utils/src/main/java/com/java110/utils/util/Assert.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/util/Assert.java b/java110-utils/src/main/java/com/java110/utils/util/Assert.java
old mode 100644
new mode 100755
index 890d06b..87e1c10
--- a/java110-utils/src/main/java/com/java110/utils/util/Assert.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/Assert.java
@@ -16,6 +16,13 @@
*/
public class Assert extends org.springframework.util.Assert {
+
+ public static void hasValue(Object value,String msg){
+ Assert.notNull(value, msg);
+ Assert.hasLength(value.toString(), msg);
+
+ }
+
/**
* 鍒ゆ柇 jsonObject 鏄惁涓虹┖
*
@@ -83,6 +90,17 @@
hasLength(info.get(key) == null ? "" : info.get(key).toString(), message);
}
+ /**
+ * 鍒ゆ柇 jsonObject 鏄惁涓虹┖
+ *
+ * @param info
+ * @param key
+ * @param message
+ */
+ public static void hasKeyAndValue(Object info, String key, String message) {
+ hasKeyAndValue(BeanConvertUtil.beanCovertMap(info), key, message);
+ }
+
/**
* 鍒ゆ柇json鏄惁涓虹┖
@@ -92,7 +110,7 @@
*/
public static void listIsNull(List jsonArray, String message) {
- if (jsonArray != null && jsonArray.size() > 0) {
+ if (jsonArray != null && !jsonArray.isEmpty()) {
throw new IllegalArgumentException(message);
}
}
@@ -329,5 +347,44 @@
}
}
+ public static void judgeAttrValue(JSONObject paramObj){
+ if (!paramObj.containsKey("attrs")) {
+ return;
+ }
+
+ JSONArray attrs = paramObj.getJSONArray("attrs");
+ if (attrs.size() < 1) {
+ return;
+ }
+ JSONObject attr = null;
+ for (int attrIndex = 0; attrIndex < attrs.size(); attrIndex++) {
+ attr = attrs.getJSONObject(attrIndex);
+ if (!"Y".equals(attr.getString("required"))) {
+ continue;
+ }
+ Assert.hasKeyAndValue(attr, "value", attr.getString("specName") + "涓嶈兘涓虹┖");
+
+ //鏁存暟
+ if ("2002".equals(attr.getString("specValueType"))) {
+ Assert.isInteger(attr.getString("value"), attr.getString("specName") + "涓嶆槸鏁存暟");
+ }
+
+ //鏁存暟
+ if ("3003".equals(attr.getString("specValueType"))) {
+ Assert.isMoney(attr.getString("value"), attr.getString("specName") + "涓嶆槸閲戦绫诲瀷 濡� 3.00");
+ }
+
+ // 鏃ユ湡4004
+ if ("4004".equals(attr.getString("specValueType"))) {
+ Assert.isDate(attr.getString("value"), DateUtil.DATE_FORMATE_STRING_B, attr.getString("specName") + "涓嶆槸鏃ユ湡鏍煎紡 YYYY-MM-DD");
+ }
+
+ // 鏃ユ湡5005
+ if ("5005".equals(attr.getString("specValueType"))) {
+ Assert.isDate(attr.getString("value"), DateUtil.DATE_FORMATE_STRING_A, attr.getString("specName") + "涓嶆槸鏃ユ湡鏍煎紡 YYYY-MM-DD hh:mm:ss");
+ }
+ }
+ }
+
}
--
Gitblit v1.8.0