From ee24d6084fe46b86152d1109af592f619797c437 Mon Sep 17 00:00:00 2001
From: CYF <1590648573@qq.com>
Date: Fri, 28 Mar 2025 20:31:01 +0800
Subject: [PATCH] CYF

---
 .../src/views/model/AppletConfig/index.vue         |  68 +++++----
 .../java/com/ruoyi/model/domain/AppletConfig.java  | 160 +++++++++++----------
 .../src/main/resources/AppletConfigMapper.xml      |  93 ++++++++++++
 .../resources/mapper/model/AppletConfigMapper.xml  |  56 ++++++--
 4 files changed, 256 insertions(+), 121 deletions(-)
 create mode 100644 ruoyi-catdog/src/main/resources/AppletConfigMapper.xml

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 1a44ada..c1c4ac2 100644
--- a/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/index.vue
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/index.vue
@@ -1,6 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+      <el-form-item label="说明" prop="paramValue">
+        <el-input
+          v-model="queryParams.paramValue"
+          placeholder="请输入说明"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="参数编码" prop="paramCode">
         <el-input
           v-model="queryParams.paramCode"
@@ -84,16 +93,11 @@
     <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" />
-      <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" prop="paramValue" v-if="columns[0].visible"/>
+      <el-table-column label="参数编码" align="center" prop="paramCode" v-if="columns[1].visible"/>
+      <el-table-column label="参数值-普通文本" align="center" prop="paramValueText" v-if="columns[2].visible"/>
+      <el-table-column label="参数值-图片" align="center" prop="paramValueImage" v-if="columns[3].visible"/>
+      <el-table-column label="参数值-富文本" align="center" prop="paramValueArea" v-if="columns[4].visible"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -113,7 +117,7 @@
         </template>
       </el-table-column>
     </el-table>
-
+    
     <pagination
       v-show="total>0"
       :total="total"
@@ -124,28 +128,25 @@
 
     <!-- 添加或修改配置信息对话框 -->
     <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-one">
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+        <el-form-item label="说明" prop="paramValue">
+          <el-input v-model="form.paramValue" placeholder="请输入说明" />
+        </el-form-item>
         <el-form-item label="参数编码" prop="paramCode">
           <el-input v-model="form.paramCode" placeholder="请输入参数编码" />
         </el-form-item>
-        <el-form-item label="说明" prop="paramValue">
-          <el-input v-model="form.paramValue" placeholder="请输入参数说明" />
-        </el-form-item>
-        <el-form-item label="普通文本" prop="paramValueText">
+        <el-form-item label="参数值-普通文本" prop="paramValueText">
           <el-input v-model="form.paramValueText" placeholder="请输入参数值-普通文本" />
         </el-form-item>
-        <el-form-item label="图片">
-<!--          <imageUpload v-model="form.paramValueImage"/>-->
-          <oss-image-upload v-model="form.paramValueImage" :limit="1"></oss-image-upload>
+        <el-form-item label="参数值-图片">
+          <imageUpload v-model="form.paramValueImage"/>
         </el-form-item>
-        <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 label="参数值-富文本" prop="paramValueArea">
+          <el-input v-model="form.paramValueArea" placeholder="请输入参数值-富文本" />
+        </el-form-item>
+        <el-form-item label="删除标识" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除标识" />
         </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>
@@ -186,8 +187,10 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        paramCode: null,
         paramValue: null,
+
+        paramCode: null,
+
         paramValueText: null,
 
         paramValueImage: null,
@@ -205,10 +208,11 @@ export default {
 
       },
       columns: [
-    { key: 1, label: "参数编码", visible:  true  },
-    { key: 2, label: "参数值-普通文本", visible:  true  },
-    { key: 3, label: "参数值-图片", visible:  false  },
-    { key: 4, label: "参数值-富文本", visible:  true  },
+    { key: 1, label: "说明", visible:  true  },
+    { key: 2, label: "参数编码", visible:  true  },
+    { key: 3, label: "参数值-普通文本", visible:  true  },
+    { key: 4, label: "参数值-图片", visible:  false  },
+    { key: 5, label: "参数值-富文本", visible:  true  },
      ],
     };
   },
@@ -235,6 +239,8 @@ export default {
       this.form = {
         id: null,
 
+        paramValue: null,
+
         paramCode: null,
 
         paramValueText: 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 f9658d4..1611228 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,6 +1,5 @@
 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;
@@ -12,7 +11,6 @@ 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;
@@ -20,14 +18,14 @@ public class AppletConfig extends BaseEntity
     /** 唯一标识 */
     private Long id;
 
+    /** 说明 */
+    @Excel(name = "说明")
+    private String paramValue;
+
     /** 参数编码 */
     @Excel(name = "参数编码")
     private String paramCode;
 
-    /** 参数说明 */
-    @Excel(name = "参数说明")
-    private String paramValue;
-
     /** 参数值-普通文本 */
     @Excel(name = "参数值-普通文本")
     private String paramValueText;
@@ -43,74 +41,84 @@ 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 setParamValue(String paramValue) 
+    {
+        this.paramValue = paramValue;
+    }
+
+    public String getParamValue() 
+    {
+        return paramValue;
+    }
+    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("paramValue", getParamValue())
+            .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/AppletConfigMapper.xml b/ruoyi-catdog/src/main/resources/AppletConfigMapper.xml
new file mode 100644
index 0000000..adb70fc
--- /dev/null
+++ b/ruoyi-catdog/src/main/resources/AppletConfigMapper.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.model.mapper.AppletConfigMapper">
+    
+    <resultMap type="AppletConfig" id="AppletConfigResult">
+        <result property="paramValue"    column="param_value"    />
+        <result property="paramCode"    column="param_code"    />
+        <result property="paramValueText"    column="param_value_text"    />
+        <result property="paramValueImage"    column="param_value_image"    />
+        <result property="paramValueArea"    column="param_value_area"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectAppletConfigVo">
+        select param_value,param_code, param_value_text, param_value_image, param_value_area, del_flag, create_by, create_time, update_by, update_time from applet_config
+    </sql>
+
+    <select id="selectAppletConfigList" parameterType="AppletConfig" resultMap="AppletConfigResult">
+        <include refid="selectAppletConfigVo"/>
+        <where>  
+            <if test="paramValue != null  and paramValue != ''"> and param_code = #{paramValue}</if>
+            <if test="paramCode != null  and paramCode != ''"> and param_code = #{paramCode}</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>
+        </where>
+    </select>
+    
+    <select id="selectAppletConfigByParamCode" parameterType="String" resultMap="AppletConfigResult">
+        <include refid="selectAppletConfigVo"/>
+        where param_code = #{paramCode}
+    </select>
+
+    <insert id="insertAppletConfig" parameterType="AppletConfig">
+        insert into applet_config
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="paramValue != null">param_value,</if>
+            <if test="paramCode != null">param_code,</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>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="paramValue != null">#{paramValue},</if>
+            <if test="paramCode != null">#{paramCode},</if>
+            <if test="paramValueText != null">#{paramValueText},</if>
+            <if test="paramValueImage != null">#{paramValueImage},</if>
+            <if test="paramValueArea != null">#{paramValueArea},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAppletConfig" parameterType="AppletConfig">
+        update applet_config
+        <trim prefix="SET" suffixOverrides=",">
+            <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>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where param_code = #{paramCode}
+    </update>
+
+    <delete id="deleteAppletConfigByParamCode" parameterType="String">
+        delete from applet_config where param_code = #{paramCode}
+    </delete>
+
+    <delete id="deleteAppletConfigByParamCodes" parameterType="String">
+        delete from applet_config where param_code in 
+        <foreach item="paramCode" collection="array" open="(" separator="," close=")">
+            #{paramCode}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml
index 6788dfb..e16300c 100644
--- a/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml
+++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml
@@ -3,66 +3,94 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.model.mapper.AppletConfigMapper">
-
+    
     <resultMap type="AppletConfig" id="AppletConfigResult">
+        <result property="id"    column="id"    />
+        <result property="paramValue"    column="param_value"    />
         <result property="paramCode"    column="param_code"    />
         <result property="paramValueText"    column="param_value_text"    />
         <result property="paramValueImage"    column="param_value_image"    />
         <result property="paramValueArea"    column="param_value_area"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectAppletConfigVo">
-        select param_code, param_value_text, param_value_image, param_value_area from applet_config
+        select id, param_value, param_code, param_value_text, param_value_image, param_value_area, del_flag, create_by, create_time, update_by, update_time from applet_config
     </sql>
+
     <select id="selectAppletConfigList" parameterType="AppletConfig" resultMap="AppletConfigResult">
         <include refid="selectAppletConfigVo"/>
-        <where>
+        <where>  
+            <if test="paramValue != null  and paramValue != ''"> and param_value = #{paramValue}</if>
             <if test="paramCode != null  and paramCode != ''"> and param_code = #{paramCode}</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>
         </where>
     </select>
-
-    <select id="selectAppletConfigByParamCode" parameterType="String" resultMap="AppletConfigResult">
+    
+    <select id="selectAppletConfigById" parameterType="Long" resultMap="AppletConfigResult">
         <include refid="selectAppletConfigVo"/>
-        where param_code = #{paramCode}
+        where id = #{id}
     </select>
 
-    <insert id="insertAppletConfig" parameterType="AppletConfig">
+    <insert id="insertAppletConfig" parameterType="AppletConfig" useGeneratedKeys="true" keyProperty="id">
         insert into applet_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="paramValue != null">param_value,</if>
             <if test="paramCode != null">param_code,</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>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="paramValue != null">#{paramValue},</if>
             <if test="paramCode != null">#{paramCode},</if>
             <if test="paramValueText != null">#{paramValueText},</if>
             <if test="paramValueImage != null">#{paramValueImage},</if>
             <if test="paramValueArea != null">#{paramValueArea},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
          </trim>
     </insert>
 
     <update id="updateAppletConfig" parameterType="AppletConfig">
         update applet_config
         <trim prefix="SET" suffixOverrides=",">
+            <if test="paramValue != null">param_value = #{paramValue},</if>
+            <if test="paramCode != null">param_code = #{paramCode},</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>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
-        where param_code = #{paramCode}
+        where id = #{id}
     </update>
 
-    <delete id="deleteAppletConfigByParamCode" parameterType="String">
-        delete from applet_config where param_code = #{paramCode}
+    <delete id="deleteAppletConfigById" parameterType="Long">
+        delete from applet_config where id = #{id}
     </delete>
 
-    <delete id="deleteAppletConfigByParamCodes" parameterType="String">
-        delete from applet_config where param_code in
-        <foreach item="paramCode" collection="array" open="(" separator="," close=")">
-            #{paramCode}
+    <delete id="deleteAppletConfigByIds" parameterType="String">
+        delete from applet_config where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
 </mapper>
\ No newline at end of file