From 692c4889ab73270fa0030c2f4d3d686bbb29f977 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 20 Sep 2024 15:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=EF=BC=9A=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E5=A2=9E?= =?UTF-8?q?=E6=94=B9CssClass=E5=A2=9E=E5=8A=A0=E9=A2=9C=E8=89=B2=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E9=99=90=E5=88=B6=EF=BC=8C=E6=97=A0=E6=95=88=E5=85=A5?= =?UTF-8?q?=E5=8F=82=E6=A0=A1=E9=AA=8C=E5=99=A8=E7=A7=BB=E9=99=A4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/dict/vo/data/DictDataSaveReqVO.java | 2 ++ .../OrderStatisticsUnitInEnumValidator.java | 36 ------------------- .../system/dict/CssClassValid.java} | 18 +++++----- .../system/dict/CssClassValidator.java | 27 ++++++++++++++ 4 files changed, 39 insertions(+), 44 deletions(-) delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/order/OrderStatisticsUnitInEnumValidator.java rename cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/{order/OrderStatisticsUnitInEnum.java => validation/system/dict/CssClassValid.java} (51%) create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/dict/CssClassValidator.java diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java index 8537ef0d0..10650ce47 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java @@ -2,6 +2,7 @@ package com.cf.imes.module.system.controller.admin.dict.vo.data; import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.validation.InEnum; +import com.cf.imes.module.system.validation.system.dict.CssClassValid; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -44,6 +45,7 @@ public class DictDataSaveReqVO { private String colorType; @Schema(description = "css 样式", example = "btn-visible") + @CssClassValid private String cssClass; @Schema(description = "备注", example = "我是一个角色") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/order/OrderStatisticsUnitInEnumValidator.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/order/OrderStatisticsUnitInEnumValidator.java deleted file mode 100644 index 85cd02a5e..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/order/OrderStatisticsUnitInEnumValidator.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cf.imes.module.system.order; - -import cn.hutool.core.util.ObjectUtil; -import com.cf.imes.module.executor.enums.OrderStatisticsUnit; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - -/** - * 生产单统计维度单位入参校验器 - * - * @author Gqr - * @since 2024/7/17 9:33 - */ -public class OrderStatisticsUnitInEnumValidator implements ConstraintValidator { - - @Override - public void initialize(OrderStatisticsUnitInEnum constraintAnnotation) { - ConstraintValidator.super.initialize(constraintAnnotation); - } - - @Override - public boolean isValid(Integer value, ConstraintValidatorContext context) { - if (ObjectUtil.isNull(value)) { - return true; - } - OrderStatisticsUnit unit = OrderStatisticsUnit.fromValue(value); - if (ObjectUtil.isNotNull(unit)) { - return true; - } else { - return false; - } - } - -} - diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/order/OrderStatisticsUnitInEnum.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/dict/CssClassValid.java similarity index 51% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/order/OrderStatisticsUnitInEnum.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/dict/CssClassValid.java index 6bc77140e..4c4fe19de 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/order/OrderStatisticsUnitInEnum.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/dict/CssClassValid.java @@ -1,14 +1,16 @@ -package com.cf.imes.module.system.order; +package com.cf.imes.module.system.validation.system.dict; import javax.validation.Constraint; import javax.validation.Payload; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** - * 生产单统计维度单位入参校验注解 - * * @author Gqr - * @since 2024/7/17 9:33 + * @since 2024/9/20 15:24 */ @Target({ ElementType.METHOD, @@ -21,10 +23,10 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Documented @Constraint( - validatedBy = {OrderStatisticsUnitInEnumValidator.class} + validatedBy = {CssClassValidator.class} ) -public @interface OrderStatisticsUnitInEnum { - String message() default "生产单统计维度单位[unit]错误，请检查"; +public @interface CssClassValid { + String message() default "颜色格式错误，请检查"; Class[] groups() default {}; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/dict/CssClassValidator.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/dict/CssClassValidator.java new file mode 100644 index 000000000..b699b2cb9 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/dict/CssClassValidator.java @@ -0,0 +1,27 @@ +package com.cf.imes.module.system.validation.system.dict; + +import org.apache.commons.lang3.StringUtils; + +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; + +/** + * @author Gqr + * @since 2024/9/20 15:27 + */ +public class CssClassValidator implements ConstraintValidator { + private static final String REGEX = "^#([0-9a-fA-F]{3}){1,2}$"; + + @Override + public void initialize(CssClassValid constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(String value, ConstraintValidatorContext context) { + if (StringUtils.isEmpty(value)) { + return true; + } + return value.matches(REGEX); + } +}