diff --git a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/enums/ValiArgsType.java b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/enums/ValiArgsType.java index a085e294..6739458d 100644 --- a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/enums/ValiArgsType.java +++ b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/enums/ValiArgsType.java @@ -31,6 +31,8 @@ public enum ValiArgsType { IS_GENERAL, /** 数字 */ IS_NUMBER, + /** 小数浮点 */ + IS_DECIMAL, /** 纯字母 */ IS_LETTER, /** 大写 */ diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/msg/ValidationMsg.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/msg/ValidationMsg.java index ce782f43..e366ed62 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/msg/ValidationMsg.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/msg/ValidationMsg.java @@ -32,40 +32,42 @@ public enum ValidationMsg implements BaseMsg { EXCEPTION_IS_GENERAL(9801,"不是字母,数字或下划线! "), /** 数字 */ EXCEPTION_IS_NUMBER(9802,"不是数字! "), + /** 小数浮点 */ + EXCEPTION_IS_DECIMAL(9803,"不是小数浮点! "), /** 纯字母 */ - EXCEPTION_IS_LETTER(9803,"不是纯字母! "), + EXCEPTION_IS_LETTER(9804,"不是纯字母! "), /** 大写 */ - EXCEPTION_IS_UPPER_CASE(9804,"不是大写字母! "), + EXCEPTION_IS_UPPER_CASE(9805,"不是大写字母! "), /** 小写 */ - EXCEPTION_IS_LOWER_CASE(9805,"不是小写字母! "), + EXCEPTION_IS_LOWER_CASE(9806,"不是小写字母! "), /** ip4 */ - EXCEPTION_IS_IPV4(9806,"不是IPV4地址! "), + EXCEPTION_IS_IPV4(9807,"不是IPV4地址! "), /** 金额 */ - EXCEPTION_IS_MONEY(9807,"不是金额! "), + EXCEPTION_IS_MONEY(9808,"不是金额! "), /** 邮箱 */ - EXCEPTION_IS_EMAIL(9808,"不是邮箱! "), + EXCEPTION_IS_EMAIL(9809,"不是邮箱! "), /** 手机号 */ - EXCEPTION_IS_MOBILE(9809,"不是手机号! "), + EXCEPTION_IS_MOBILE(98010,"不是手机号! "), /** 18位身份证 */ - EXCEPTION_IS_CITIZENID(9810,"不是18位身份证! "), + EXCEPTION_IS_CITIZENID(9811,"不是18位身份证! "), /** 邮编 */ - EXCEPTION_IS_ZIPCODE(9811,"不是邮编! "), + EXCEPTION_IS_ZIPCODE(9812,"不是邮编! "), /** URL */ - EXCEPTION_IS_URL(9812,"不是URL! "), + EXCEPTION_IS_URL(9813,"不是URL! "), /** 汉字 */ - EXCEPTION_IS_CHINESE(9813,"不是汉字! "), + EXCEPTION_IS_CHINESE(9814,"不是汉字! "), /** 汉字,字母,数字和下划线 */ - EXCEPTION_IS_GENERAL_WITH_CHINESE(9814,"不是汉字,字母,数字和下划线! "), + EXCEPTION_IS_GENERAL_WITH_CHINESE(9815,"不是汉字,字母,数字和下划线! "), /** MAC地址 */ - EXCEPTION_IS_MAC(9815,"不是MAC地址! "), + EXCEPTION_IS_MAC(9816,"不是MAC地址! "), /** 中国车牌 */ - EXCEPTION_IS_PLATE_NUMBER(9816,"不是中国车牌! "), + EXCEPTION_IS_PLATE_NUMBER(9817,"不是中国车牌! "), /** 超出最大长度 */ - EXCEPTION_IS_MAX(9816,"超出最大长度! "), - + EXCEPTION_IS_MAX(9818,"超出最大长度! "), /** 小于最小长度 */ - EXCEPTION_IS_MIN(9816,"小于最小长度! "), + EXCEPTION_IS_MIN(9819,"小于最小长度! "), + ; diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/ValidationUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/ValidationUtil.java index f38d54a8..90115375 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/ValidationUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/ValidationUtil.java @@ -132,6 +132,18 @@ public final class ValidationUtil { throw new ServiceException(msg); } break; + // 小数浮点 + case IS_DECIMAL: + if(StringUtils.isEmpty(value)){ + break; + } + boolean decimal = Validator.isMoney(value); + if(!decimal){ + ValidationMsg msg = ValidationMsg.EXCEPTION_IS_DECIMAL; + msg.setFieldName(fieldName); + throw new ServiceException(msg); + } + break; // 纯字母 case IS_LETTER: if(StringUtils.isEmpty(value)){