From 6b36dc5294d3d9ed6d45f778a1b17f0aed68d178 Mon Sep 17 00:00:00 2001
From: dongzeliang <2746733890@qq.com>
Date: Tue, 14 Jan 2025 17:24:21 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20SysConfig=E4=BD=BF=E7=94=A8=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysConfigController.java       | 12 ++++---
 .../com/muyu/system/domain/SysConfig.java     | 17 ++++++++++
 .../system/domain/rep/SysConfigUpdReq.java    | 33 +++++++++++++++++++
 3 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java
index 456e576..8859283 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java
@@ -15,6 +15,7 @@ import com.muyu.system.domain.SysConfig;
 import com.muyu.system.domain.model.SysConfigPageQueryModel;
 import com.muyu.system.domain.rep.SysConfigAddReq;
 import com.muyu.system.domain.rep.SysConfigListReq;
+import com.muyu.system.domain.rep.SysConfigUpdReq;
 import com.muyu.system.service.SysConfigService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -93,12 +94,13 @@ public class SysConfigController extends BaseController {
     @RequiresPermissions("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping("/{sysConfigId}")
-    public Result edit (@PathVariable("sysConfigId")Long sysConfigId, @Validated @RequestBody SysConfig config) {
-        if (!configService.checkConfigKeyUnique(config.getConfigKey())) {
-            return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+    public Result edit (@PathVariable("sysConfigId")Long sysConfigId, @Validated @RequestBody SysConfigUpdReq sysConfigUpdReq) {
+        if (!configService.checkConfigKeyUnique(sysConfigUpdReq.getConfigKey())) {
+            return error("修改参数'" + sysConfigUpdReq.getConfigName() + "'失败，参数键名已存在");
         }
-        config.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(configService.updateById(config));
+        return toAjax(configService.updateById(
+                SysConfig.updReqBuild(sysConfigUpdReq, sysConfigId)
+        ));
     }
 
     /**
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java
index 57820cb..3ff99b0 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java
@@ -8,6 +8,7 @@ import com.muyu.common.core.annotation.Excel.ColumnType;
 import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.system.domain.rep.SysConfigAddReq;
+import com.muyu.system.domain.rep.SysConfigUpdReq;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -95,4 +96,20 @@ public class SysConfig extends BaseEntity {
                 .createBy(SecurityUtils.getUsername())
                 .build();
     }
+    /**
+     * 通过请求参数直接构建数据库
+     * @param updReq 请求对象
+     * @return 添加对象
+     */
+    public static SysConfig updReqBuild(SysConfigUpdReq updReq, Long sysConfigId) {
+        return builder()
+                .configId(sysConfigId)
+                .configKey(updReq.getConfigKey())
+                .configName(updReq.getConfigName())
+                .configValue(updReq.getConfigValue())
+                .configType(updReq.getConfigType())
+                .remark(updReq.getRemark())
+                .updateBy(SecurityUtils.getUsername())
+                .build();
+    }
 }
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigUpdReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigUpdReq.java
index 53b902e..b90e226 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigUpdReq.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigUpdReq.java
@@ -1,10 +1,43 @@
 package com.muyu.system.domain.rep;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 /**
  * @author dongzeliang
  * @version 1.0
  * @description: 系统配置修改请求
  * @date 2025/1/14 10:39
  */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class SysConfigUpdReq {
+    /**
+     * 参数名称
+     */
+    private String configName;
+
+    /**
+     * 参数键名
+     */
+    private String configKey;
+
+    /**
+     * 参数键值
+     */
+    private String configValue;
+
+    /**
+     * 系统内置（Y是 N否）
+     */
+    private String configType;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }