禅道问题修复:字典数据增改CssClass增加颜色格式限制,无效入参校验器移除;

This commit is contained in:
gaoqr
2024-09-20 15:40:37 +08:00
parent 0110c194c4
commit 692c4889ab
4 changed files with 39 additions and 44 deletions
@@ -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.enums.CommonStatusEnum;
import com.cf.imes.framework.common.validation.InEnum; 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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@@ -44,6 +45,7 @@ public class DictDataSaveReqVO {
private String colorType; private String colorType;
@Schema(description = "css 样式", example = "btn-visible") @Schema(description = "css 样式", example = "btn-visible")
@CssClassValid
private String cssClass; private String cssClass;
@Schema(description = "备注", example = "我是一个角色") @Schema(description = "备注", example = "我是一个角色")
@@ -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<OrderStatisticsUnitInEnum, Integer> {
@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;
}
}
}
@@ -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.Constraint;
import javax.validation.Payload; 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 * @author Gqr
* @since 2024/7/17 9:33 * @since 2024/9/20 15:24
*/ */
@Target({ @Target({
ElementType.METHOD, ElementType.METHOD,
@@ -21,10 +23,10 @@ import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
@Constraint( @Constraint(
validatedBy = {OrderStatisticsUnitInEnumValidator.class} validatedBy = {CssClassValidator.class}
) )
public @interface OrderStatisticsUnitInEnum { public @interface CssClassValid {
String message() default "生产单统计维度单位[unit]错误,请检查"; String message() default "颜色格式错误,请检查";
Class<?>[] groups() default {}; Class<?>[] groups() default {};
@@ -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<CssClassValid, String> {
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);
}
}