【升级】完善FlagValue的校验逻辑

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/validation/flag/FlagValue.java

@@ -48,6 +48,11 @@ public @interface FlagValue {
    Class<? extends Payload>[] payload() default {};
    /**
     * 是否必填
     */
    boolean required() default true;
    @Target({ElementType.FIELD, ElementType.PARAMETER})
    @Retention(RUNTIME)
    @Documented

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/validation/flag/FlagValueValidator.java

@@ -24,6 +24,7 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
 */
package cn.stylefeng.guns.core.validation.flag;
import cn.hutool.core.util.StrUtil;
import cn.stylefeng.guns.core.enums.YesOrNotEnum;
import javax.validation.ConstraintValidator;
@@ -37,8 +38,27 @@ import javax.validation.ConstraintValidatorContext;
 */
public class FlagValueValidator implements ConstraintValidator<FlagValue, String> {
    private Boolean required;
    @Override
    public void initialize(FlagValue constraintAnnotation) {
        this.required = constraintAnnotation.required();
    }
    @Override
    public boolean isValid(String flagValue, ConstraintValidatorContext context) {
        return YesOrNotEnum.Y.getCode().equals(flagValue) || YesOrNotEnum.N.getCode().equals(flagValue);
        // 如果是必填的
        if (required) {
            return YesOrNotEnum.Y.getCode().equals(flagValue) || YesOrNotEnum.N.getCode().equals(flagValue);
        } else {
            //如果不是必填，可以为空
            if (StrUtil.isEmpty(flagValue)) {
                return true;
            } else {
                return YesOrNotEnum.Y.getCode().equals(flagValue) || YesOrNotEnum.N.getCode().equals(flagValue);
            }
        }
    }
}