diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/constant/TsConfigKeyEnum.java b/adc-da-sys/src/main/java/com/adc/da/sys/constant/TsConfigKeyEnum.java index 9184911..5e5f952 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/constant/TsConfigKeyEnum.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/constant/TsConfigKeyEnum.java @@ -1,7 +1,7 @@ package com.adc.da.sys.constant; /** - * @author ThinkBook + * @author CaiHaohan */ public enum TsConfigKeyEnum { @@ -9,5 +9,29 @@ public enum TsConfigKeyEnum { /** * 水印前缀 */ - WATERMARK_PREFIX + WATERMARK_PREFIX("WATERMARK_PREFIX", "水印前缀"); + + + /** + * 对应Key + */ + private String value; + + /** + * 代表意义 + */ + private String label; + + TsConfigKeyEnum(String value, String label) { + this.value = value; + this.label = label; + } + + public String getValue() { + return value; + } + + public String getLabel() { + return label; + } } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/ConfigServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/ConfigServiceImpl.java index 8de66dc..5c8328b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/ConfigServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/ConfigServiceImpl.java @@ -56,7 +56,7 @@ public class ConfigServiceImpl extends ServiceImpl public List findAllConfig() { List result = new ArrayList<>(); for (TsConfigKeyEnum configKey : TsConfigKeyEnum.values()) { - List configEntityList = query().eq("config_key", configKey.toString()).list(); + List configEntityList = query().eq("config_key", configKey.getValue()).list(); if (!configEntityList.isEmpty()){ ConfigVo configVo = new ConfigVo(); BeanUtil.copyProperties(configEntityList.get(0), configVo); @@ -84,14 +84,12 @@ public class ConfigServiceImpl extends ServiceImpl * @return */ private boolean isKeyValid(String key) { - boolean isValid = false; - for (TsConfigKeyEnum configKey : TsConfigKeyEnum.values()) { - if (configKey.toString().equals(key)) { - isValid = true; + if (configKey.getValue().equals(key)) { + return true; } } - return isValid; + return false; } }