From 502131772903e865d408143d4a800c774462a687 Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Fri, 28 Mar 2025 18:30:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/model/AppletConfig/index.vue         |  40 ++++--
 .../java/com/ruoyi/model/domain/AppletConfig.java  | 146 +++++++++++----------
 .../resources/mapper/model/AppletConfigMapper.xml  |   6 +
 3 files changed, 108 insertions(+), 84 deletions(-)

diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/index.vue
index 9df0f48..1a44ada 100644
--- a/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/index.vue
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/index.vue
@@ -84,10 +84,16 @@
     <el-table v-loading="loading" :data="AppletConfigList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="唯一标识" align="center" prop="id" />
-      <el-table-column label="参数编码" align="center" prop="paramCode" v-if="columns[0].visible"/>
-      <el-table-column label="参数值-普通文本" align="center" prop="paramValueText" v-if="columns[1].visible"/>
-      <el-table-column label="参数值-图片" align="center" prop="paramValueImage" v-if="columns[2].visible"/>
-      <el-table-column label="参数值-富文本" align="center" prop="paramValueArea" v-if="columns[3].visible"/>
+      <el-table-column label="参数编码" align="center" prop="paramCode" />
+      <el-table-column label="参数说明" align="center" prop="paramValue" />
+      <el-table-column label="参数值-普通文本" align="center" prop="paramValueText"/>
+<!--      <el-table-column label="参数值-图片" align="center" prop="paramValueImage"/>-->
+      <el-table-column label="参数值-图片" align="center" prop="paramValueImage">
+        <template slot-scope="{ row }">
+          <el-image v-if="row.paramValueImage" :src="row.paramValueImage" :preview-src-list="[row.paramValueImage]" class="small-img circle-img"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="参数值-富文本" align="center" prop="paramValueArea" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -118,22 +124,28 @@
 
     <!-- 添加或修改配置信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-one">
         <el-form-item label="参数编码" prop="paramCode">
           <el-input v-model="form.paramCode" placeholder="请输入参数编码" />
         </el-form-item>
-        <el-form-item label="参数值-普通文本" prop="paramValueText">
-          <el-input v-model="form.paramValueText" placeholder="请输入参数值-普通文本" />
+        <el-form-item label="说明" prop="paramValue">
+          <el-input v-model="form.paramValue" placeholder="请输入参数说明" />
         </el-form-item>
-        <el-form-item label="参数值-图片">
-          <imageUpload v-model="form.paramValueImage"/>
+        <el-form-item label="普通文本" prop="paramValueText">
+          <el-input v-model="form.paramValueText" placeholder="请输入参数值-普通文本" />
         </el-form-item>
-        <el-form-item label="参数值-富文本" prop="paramValueArea">
-          <el-input v-model="form.paramValueArea" placeholder="请输入参数值-富文本" />
+        <el-form-item label="图片">
+<!--          <imageUpload v-model="form.paramValueImage"/>-->
+          <oss-image-upload v-model="form.paramValueImage" :limit="1"></oss-image-upload>
         </el-form-item>
-        <el-form-item label="删除标识" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标识" />
+        <el-form-item label="富文本" prop="paramValueArea">
+<!--          <el-input v-model="form.paramValueArea" placeholder="请输入参数值-富文本" />-->
+          <Editor v-model="form.paramValueArea" placeholder="请输入参数值-富文本" type="url"></Editor>
         </el-form-item>
+
+<!--        <el-form-item label="删除标识" prop="delFlag">-->
+<!--          <el-input v-model="form.delFlag" placeholder="请输入删除标识" />-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -175,7 +187,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         paramCode: null,
-
+        paramValue: null,
         paramValueText: null,
 
         paramValueImage: null,
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletConfig.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletConfig.java
index caf637e..f9658d4 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletConfig.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletConfig.java
@@ -1,5 +1,6 @@
 package com.ruoyi.model.domain;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-03-28
  */
+@Data
 public class AppletConfig extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -22,6 +24,10 @@ public class AppletConfig extends BaseEntity
     @Excel(name = "参数编码")
     private String paramCode;
 
+    /** 参数说明 */
+    @Excel(name = "参数说明")
+    private String paramValue;
+
     /** 参数值-普通文本 */
     @Excel(name = "参数值-普通文本")
     private String paramValueText;
@@ -37,74 +43,74 @@ public class AppletConfig extends BaseEntity
     /** 删除标识 */
     private Integer delFlag;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setParamCode(String paramCode) 
-    {
-        this.paramCode = paramCode;
-    }
-
-    public String getParamCode() 
-    {
-        return paramCode;
-    }
-    public void setParamValueText(String paramValueText) 
-    {
-        this.paramValueText = paramValueText;
-    }
-
-    public String getParamValueText() 
-    {
-        return paramValueText;
-    }
-    public void setParamValueImage(String paramValueImage) 
-    {
-        this.paramValueImage = paramValueImage;
-    }
-
-    public String getParamValueImage() 
-    {
-        return paramValueImage;
-    }
-    public void setParamValueArea(String paramValueArea) 
-    {
-        this.paramValueArea = paramValueArea;
-    }
-
-    public String getParamValueArea() 
-    {
-        return paramValueArea;
-    }
-    public void setDelFlag(Integer delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Integer getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("paramCode", getParamCode())
-            .append("paramValueText", getParamValueText())
-            .append("paramValueImage", getParamValueImage())
-            .append("paramValueArea", getParamValueArea())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
+//    public void setId(Long id)
+//    {
+//        this.id = id;
+//    }
+//
+//    public Long getId()
+//    {
+//        return id;
+//    }
+//    public void setParamCode(String paramCode)
+//    {
+//        this.paramCode = paramCode;
+//    }
+//
+//    public String getParamCode()
+//    {
+//        return paramCode;
+//    }
+//    public void setParamValueText(String paramValueText)
+//    {
+//        this.paramValueText = paramValueText;
+//    }
+//
+//    public String getParamValueText()
+//    {
+//        return paramValueText;
+//    }
+//    public void setParamValueImage(String paramValueImage)
+//    {
+//        this.paramValueImage = paramValueImage;
+//    }
+//
+//    public String getParamValueImage()
+//    {
+//        return paramValueImage;
+//    }
+//    public void setParamValueArea(String paramValueArea)
+//    {
+//        this.paramValueArea = paramValueArea;
+//    }
+//
+//    public String getParamValueArea()
+//    {
+//        return paramValueArea;
+//    }
+//    public void setDelFlag(Integer delFlag)
+//    {
+//        this.delFlag = delFlag;
+//    }
+//
+//    public Integer getDelFlag()
+//    {
+//        return delFlag;
+//    }
+//
+//    @Override
+//    public String toString() {
+//        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+//            .append("id", getId())
+//            .append("paramCode", getParamCode())
+//            .append("paramValueText", getParamValueText())
+//            .append("paramValueImage", getParamValueImage())
+//            .append("paramValueArea", getParamValueArea())
+//            .append("delFlag", getDelFlag())
+//            .append("createBy", getCreateBy())
+//            .append("createTime", getCreateTime())
+//            .append("updateBy", getUpdateBy())
+//            .append("updateTime", getUpdateTime())
+//            .toString();
+//    }
 }
diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml
index 037c645..8c759c4 100644
--- a/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml
+++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="AppletConfig" id="AppletConfigResult">
         <result property="id"    column="id"    />
         <result property="paramCode"    column="param_code"    />
+        <result property="paramValue"    column="param_value"    />
         <result property="paramValueText"    column="param_value_text"    />
         <result property="paramValueImage"    column="param_value_image"    />
         <result property="paramValueArea"    column="param_value_area"    />
@@ -25,6 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectAppletConfigVo"/>
         <where>  
             <if test="paramCode != null  and paramCode != ''"> and param_code = #{paramCode}</if>
+            <if test="paramValue != null  and paramCode != ''"> and param_value = #{paramValue}</if>
+
             <if test="paramValueText != null  and paramValueText != ''"> and param_value_text = #{paramValueText}</if>
             <if test="paramValueImage != null  and paramValueImage != ''"> and param_value_image = #{paramValueImage}</if>
             <if test="paramValueArea != null  and paramValueArea != ''"> and param_value_area = #{paramValueArea}</if>
@@ -40,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into applet_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="paramCode != null">param_code,</if>
+            <if test="paramValue != null">param_value,</if>
             <if test="paramValueText != null">param_value_text,</if>
             <if test="paramValueImage != null">param_value_image,</if>
             <if test="paramValueArea != null">param_value_area,</if>
@@ -51,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="paramCode != null">#{paramCode},</if>
+            <if test="paramValue != null">#{paramValue},</if>
             <if test="paramValueText != null">#{paramValueText},</if>
             <if test="paramValueImage != null">#{paramValueImage},</if>
             <if test="paramValueArea != null">#{paramValueArea},</if>
@@ -66,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update applet_config
         <trim prefix="SET" suffixOverrides=",">
             <if test="paramCode != null">param_code = #{paramCode},</if>
+            <if test="paramValue != null">param_value = #{paramValue},</if>
             <if test="paramValueText != null">param_value_text = #{paramValueText},</if>
             <if test="paramValueImage != null">param_value_image = #{paramValueImage},</if>
             <if test="paramValueArea != null">param_value_area = #{paramValueArea},</if>