From 4e2f0a52ab1503cb4999befe446369cacfa2eed0 Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Fri, 5 May 2023 09:51:26 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=81=A5=E5=A3=AE=E6=80=A7=E6=8F=90=E5=8D=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将基础功能设置枚举类增加多个描述字段
---
 .../adc/da/sys/constant/TsConfigKeyEnum.java  | 28 +++++++++++++++++--
 .../adc/da/sys/service/ConfigServiceImpl.java | 10 +++----
 2 files changed, 30 insertions(+), 8 deletions(-)

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<ConfigDao, ConfigEntity>
     public List<ConfigVo> findAllConfig() {
         List<ConfigVo> result = new ArrayList<>();
         for (TsConfigKeyEnum configKey : TsConfigKeyEnum.values()) {
-            List<ConfigEntity> configEntityList = query().eq("config_key", configKey.toString()).list();
+            List<ConfigEntity> 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<ConfigDao, ConfigEntity>
      * @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;
     }
 }