diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/baseconfig/vo/ConfigSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/baseconfig/vo/ConfigSaveReqVO.java index dd205c833..a42f90e1b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/baseconfig/vo/ConfigSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/baseconfig/vo/ConfigSaveReqVO.java @@ -1,6 +1,6 @@ package com.cf.imes.module.system.controller.admin.baseconfig.vo; -import com.cf.imes.module.system.validation.config.ConfigEnumValid; +import com.cf.imes.module.system.validation.config.SystemConfigTypeEnumValid; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -27,7 +27,7 @@ public class ConfigSaveReqVO { @Schema(description = "配置类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "配置类型不能为空") - @ConfigEnumValid + @SystemConfigTypeEnumValid private Integer type; @Schema(description = "配置规则") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/config/ConfigTypeEnum.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/config/SystemConfigTypeEnum.java similarity index 84% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/config/ConfigTypeEnum.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/config/SystemConfigTypeEnum.java index 7a706a863..783f1a870 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/config/ConfigTypeEnum.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/config/SystemConfigTypeEnum.java @@ -12,7 +12,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum ConfigTypeEnum { +public enum SystemConfigTypeEnum { /** * 自定义板编号 */ @@ -39,11 +39,11 @@ public enum ConfigTypeEnum { */ private final String name; - public static ConfigTypeEnum fromType(Integer type) { + public static SystemConfigTypeEnum fromType(Integer type) { if (type == null) { return null; } - for (ConfigTypeEnum value : values()) { + for (SystemConfigTypeEnum value : values()) { if (ObjectUtil.equal(value.getType(), type)) { return value; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/SystemConfigServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/SystemConfigServiceImpl.java index ced293202..530c6be7c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/SystemConfigServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/SystemConfigServiceImpl.java @@ -11,7 +11,7 @@ import com.cf.imes.module.system.controller.admin.baseconfig.vo.ConfigSaveReqVO; import com.cf.imes.module.system.controller.admin.baseconfig.vo.ConfigUpdateStatusReqVO; import com.cf.imes.module.system.dal.dataobject.baseconfig.SystemConfigDO; import com.cf.imes.module.system.dal.mysql.config.SystemConfigMapper; -import com.cf.imes.module.system.enums.config.ConfigTypeEnum; +import com.cf.imes.module.system.enums.config.SystemConfigTypeEnum; import com.cf.imes.module.system.service.config.factory.SystemConfigServiceFactory; import com.cf.imes.module.system.service.config.factory.service.AbstractSystemConfigGenerateService; import com.google.common.collect.Lists; @@ -46,7 +46,7 @@ public class SystemConfigServiceImpl implements SystemConfigService { public PageResult getBaseConfigPage(ConfigPageReqVO reqVO) { PageResult configDOPageResult = baseConfigMapper.selectPage(reqVO); // todo 后续所有configTypeEnum中的类型需要上到列表补全时通过遍历enum来补充 - ConfigTypeEnum customBoardNoEnum = ConfigTypeEnum.CUSTOM_BOARD_NO; + SystemConfigTypeEnum customBoardNoEnum = SystemConfigTypeEnum.CUSTOM_BOARD_NO; CopyOnWriteArrayList configDOS = Lists.newCopyOnWriteArrayList(configDOPageResult.getList()); Optional configDOOptional = configDOS.stream().filter(c -> ObjectUtil.equal(customBoardNoEnum.getType(), c.getType())).findAny(); if (configDOOptional.isEmpty()) { diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/SystemConfigServiceFactory.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/SystemConfigServiceFactory.java index 69b0dbedb..2aeb2646f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/SystemConfigServiceFactory.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/SystemConfigServiceFactory.java @@ -1,7 +1,7 @@ package com.cf.imes.module.system.service.config.factory; import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; -import com.cf.imes.module.system.enums.config.ConfigTypeEnum; +import com.cf.imes.module.system.enums.config.SystemConfigTypeEnum; import com.cf.imes.module.system.service.config.factory.service.AbstractSystemConfigGenerateService; import com.cf.imes.module.system.service.config.factory.service.impl.CustomBoardNoGenerateService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +33,7 @@ public class SystemConfigServiceFactory { * @return */ public AbstractSystemConfigGenerateService getConfigService(int type) { - switch (ConfigTypeEnum.fromType(type)) { + switch (SystemConfigTypeEnum.fromType(type)) { case CUSTOM_BOARD_NO: return applicationContext.getBean(CustomBoardNoGenerateService.class); case INTELLIGENT_BRANCH: diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/config/ConfigEnumValid.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/config/SystemConfigTypeEnumValid.java similarity index 86% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/config/ConfigEnumValid.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/config/SystemConfigTypeEnumValid.java index 5e234c11c..38103275b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/config/ConfigEnumValid.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/config/SystemConfigTypeEnumValid.java @@ -21,9 +21,9 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Documented @Constraint( - validatedBy = {ConfigEnumValidator.class} + validatedBy = {SystemConfigTypeEnumValidator.class} ) -public @interface ConfigEnumValid { +public @interface SystemConfigTypeEnumValid { 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/config/ConfigEnumValidator.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/config/SystemConfigTypeEnumValidator.java similarity index 65% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/config/ConfigEnumValidator.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/config/SystemConfigTypeEnumValidator.java index 5b9f632f2..8e11efef3 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/config/ConfigEnumValidator.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/config/SystemConfigTypeEnumValidator.java @@ -1,7 +1,7 @@ package com.cf.imes.module.system.validation.config; import cn.hutool.core.util.ObjectUtil; -import com.cf.imes.module.system.enums.config.ConfigTypeEnum; +import com.cf.imes.module.system.enums.config.SystemConfigTypeEnum; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -13,9 +13,9 @@ import javax.validation.ConstraintValidatorContext; * @author Gqr * @since 2024/11/8 14:01 */ -public class ConfigEnumValidator implements ConstraintValidator { +public class SystemConfigTypeEnumValidator implements ConstraintValidator { @Override - public void initialize(ConfigEnumValid constraintAnnotation) { + public void initialize(SystemConfigTypeEnumValid constraintAnnotation) { ConstraintValidator.super.initialize(constraintAnnotation); } @@ -24,7 +24,7 @@ public class ConfigEnumValidator implements ConstraintValidator