From 51cbcd62234699cff3ee4748fe4f5f64ef0007ea Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Mon, 28 Oct 2024 11:47:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=88=B0MySQL8=E4=BF=9D=E7=95=99=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../baseapi/dao/parameter/SystemParamManager.java         | 8 ++++----
 .../baseapi/entity/parameter/SystemParameter.java         | 2 +-
 .../baseapi/param/parameter/SystemParameterParam.java     | 2 +-
 .../baseapi/result/parameter/SystemParameterResult.java   | 2 +-
 .../baseapi/service/parameter/SystemParamService.java     | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dao/parameter/SystemParamManager.java b/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dao/parameter/SystemParamManager.java
index 12f99f700..0c51f7072 100644
--- a/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dao/parameter/SystemParamManager.java
+++ b/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dao/parameter/SystemParamManager.java
@@ -30,21 +30,21 @@ public class SystemParamManager extends BaseManager<SystemParamMapper, SystemPar
      * 根据键名获取键值
      */
     public Optional<SystemParameter> findByKey(String key) {
-        return this.findByField(SystemParameter::getKey, key);
+        return this.findByField(SystemParameter::getParamKey, key);
     }
 
     /**
      * key重复检查
      */
     public boolean existsByKey(String key) {
-        return existedByField(SystemParameter::getKey, key);
+        return existedByField(SystemParameter::getParamKey, key);
     }
 
     /**
      * key重复检查
      */
     public boolean existsByKey(String key, Long id) {
-        return existedByField(SystemParameter::getKey, key, id);
+        return existedByField(SystemParameter::getParamKey, key, id);
     }
 
     /**
@@ -54,7 +54,7 @@ public class SystemParamManager extends BaseManager<SystemParamMapper, SystemPar
         Page<SystemParameter> mpPage = MpUtil.getMpPage(pageParam);
         return lambdaQuery().orderByDesc(MpIdEntity::getId)
             .like(StrUtil.isNotBlank(param.getName()), SystemParameter::getName, param.getName())
-            .like(StrUtil.isNotBlank(param.getKey()), SystemParameter::getKey, param.getKey())
+            .like(StrUtil.isNotBlank(param.getParamKey()), SystemParameter::getParamKey, param.getParamKey())
             .page(mpPage);
     }
 
diff --git a/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/entity/parameter/SystemParameter.java b/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/entity/parameter/SystemParameter.java
index c7bf46281..59c798b7f 100644
--- a/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/entity/parameter/SystemParameter.java
+++ b/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/entity/parameter/SystemParameter.java
@@ -28,7 +28,7 @@ public class SystemParameter extends MpBaseEntity implements ToResult<SystemPara
     private String name;
 
     /** 参数键名 */
-    private String key;
+    private String paramKey;
 
     /** 参数值 */
     private String value;
diff --git a/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/parameter/SystemParameterParam.java b/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/parameter/SystemParameterParam.java
index b88c04490..327a5bbab 100644
--- a/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/parameter/SystemParameterParam.java
+++ b/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/parameter/SystemParameterParam.java
@@ -31,7 +31,7 @@ public class SystemParameterParam {
 
     @NotEmpty(message = "参数键名不可为空", groups = ValidationGroup.add.class)
     @Schema(description = "参数键名")
-    private String key;
+    private String paramKey;
 
     @NotEmpty(message = "参数值不可为空", groups = ValidationGroup.add.class)
     @Schema(description = "参数值")
diff --git a/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/result/parameter/SystemParameterResult.java b/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/result/parameter/SystemParameterResult.java
index 9fa3bed10..bd710809d 100644
--- a/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/result/parameter/SystemParameterResult.java
+++ b/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/result/parameter/SystemParameterResult.java
@@ -24,7 +24,7 @@ public class SystemParameterResult {
     private String name;
 
     @Schema(description = "参数键名")
-    private String key;
+    private String getParamKey;
 
     @Schema(description = "参数值")
     private String value;
diff --git a/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/service/parameter/SystemParamService.java b/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/service/parameter/SystemParamService.java
index bb1eb68bb..eb32f5048 100644
--- a/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/service/parameter/SystemParamService.java
+++ b/bootx-platform/bootx-platform-service/service-baseapi/src/main/java/cn/bootx/platform/baseapi/service/parameter/SystemParamService.java
@@ -36,7 +36,7 @@ public class SystemParamService {
      */
     public void add(SystemParameterParam param) {
         SystemParameter systemParameter = SystemParameter.init(param);
-        if (systemParamManager.existsByKey(systemParameter.getKey())) {
+        if (systemParamManager.existsByKey(systemParameter.getParamKey())) {
             throw new BizException("key重复");
         }
         // 默认非内置
@@ -52,7 +52,7 @@ public class SystemParamService {
         SystemParameter systemParameter = systemParamManager.findById(param.getId())
             .orElseThrow(() -> new BizException("参数项不存在"));
 
-        if (systemParamManager.existsByKey(param.getKey(), param.getId())) {
+        if (systemParamManager.existsByKey(param.getParamKey(), param.getId())) {
             throw new BizException("key重复");
         }
         BeanUtil.copyProperties(param, systemParameter, CopyOptions.create().ignoreNullValue());