From 97e4f5c460d37ae3eb9c03396dd9dd6bb3f970cd Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 22 十一月 2023 11:33:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml | 162 ++++++++++++++++++++++++++++++------------------------
1 files changed, 90 insertions(+), 72 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
index b40ff8b..2f2b2fa 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -1,121 +1,139 @@
<?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">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
-
+
<resultMap type="SysConfig" id="SysConfigResult">
- <id property="configId" column="config_id" />
- <result property="configName" column="config_name" />
- <result property="configKey" column="config_key" />
- <result property="configValue" column="config_value" />
- <result property="configType" column="config_type" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
+ <id property="configId" column="config_id"/>
+ <result property="configName" column="config_name"/>
+ <result property="configNameI18n" column="config_name_i18n"/>
+ <result property="configKey" column="config_key"/>
+ <result property="configValue" column="config_value"/>
+ <result property="configType" column="config_type"/>
+ <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="selectConfigVo">
- select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark
- from sys_config
+ select config_id,
+ config_name,
+ config_name_i18n,
+ config_key,
+ config_value,
+ config_type,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ remark
+ from sys_config
</sql>
-
+
<!-- 鏌ヨ鏉′欢 -->
- <sql id="sqlwhereSearch">
- <where>
- <if test="configId !=null">
- and config_id = #{configId}
- </if>
- <if test="configKey !=null and configKey != ''">
- and config_key = #{configKey}
- </if>
- </where>
- </sql>
-
+ <sql id="sqlwhereSearch">
+ <where>
+ <if test="configId !=null">
+ and config_id = #{configId}
+ </if>
+ <if test="configKey !=null and configKey != ''">
+ and config_key = #{configKey}
+ </if>
+ </where>
+ </sql>
+
<select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
<include refid="sqlwhereSearch"/>
</select>
-
+
<select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
<where>
- <if test="configName != null and configName != ''">
- AND config_name like ('%${configName}%')
- </if>
- <if test="configType != null and configType != ''">
- AND config_type = #{configType}
- </if>
- <if test="configKey != null and configKey != ''">
- AND config_key like ('%${configKey}%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and create_time >= to_timestamp(#{params.beginTime},'yyyy-MM-DD')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and create_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD')
- </if>
- </where>
+ <if test="configName != null and configName != ''">
+ AND config_name like ('%${configName}%')
+ </if>
+ <if test="configType != null and configType != ''">
+ AND config_type = #{configType}
+ </if>
+ <if test="configKey != null and configKey != ''">
+ AND config_key like ('%${configKey}%')
+ </if>
+ <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
+ and create_time >= to_timestamp(#{params.beginTime},'yyyy-MM-DD')
+ </if>
+ <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
+ and create_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD')
+ </if>
+ </where>
</select>
-
+
<select id="selectConfigById" parameterType="Long" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
where config_id = #{configId}
</select>
-
+
<select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
where config_key = #{configKey} limit 1
</select>
-
+
<insert id="insertConfig" parameterType="SysConfig">
insert into sys_config (
- <if test="configName != null and configName != '' ">config_name,</if>
- <if test="configKey != null and configKey != '' ">config_key,</if>
- <if test="configValue != null and configValue != '' ">config_value,</if>
- <if test="configType != null and configType != '' ">config_type,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- <if test="remark != null and remark != ''">remark,</if>
- create_time
+ <if test="configName != null and configName != '' ">config_name,</if>
+ <if test="configNameI18n != null and configNameI18n != '' ">config_name_i18n,</if>
+ <if test="configKey != null and configKey != '' ">config_key,</if>
+ <if test="configValue != null and configValue != '' ">config_value,</if>
+ <if test="configType != null and configType != '' ">config_type,</if>
+ <if test="createBy != null and createBy != ''">create_by,</if>
+ <if test="remark != null and remark != ''">remark,</if>
+ create_time
)values(
- <if test="configName != null and configName != ''">#{configName},</if>
- <if test="configKey != null and configKey != ''">#{configKey},</if>
- <if test="configValue != null and configValue != ''">#{configValue},</if>
- <if test="configType != null and configType != ''">#{configType},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- now()
- )
+ <if test="configName != null and configName != ''">#{configName},</if>
+ <if test="configNameI18n != null and configNameI18n != ''">#{configNameI18n},</if>
+ <if test="configKey != null and configKey != ''">#{configKey},</if>
+ <if test="configValue != null and configValue != ''">#{configValue},</if>
+ <if test="configType != null and configType != ''">#{configType},</if>
+ <if test="createBy != null and createBy != ''">#{createBy},</if>
+ <if test="remark != null and remark != ''">#{remark},</if>
+ now()
+ )
</insert>
-
+
<update id="updateConfig" parameterType="SysConfig">
- update sys_config
+ update sys_config
<set>
<if test="configName != null and configName != ''">config_name = #{configName},</if>
+ <if test="configNameI18n != null and configNameI18n != ''">config_name_i18n = #{configNameI18n},</if>
<if test="configKey != null and configKey != ''">config_key = #{configKey},</if>
<if test="configValue != null and configValue != ''">config_value = #{configValue},</if>
<if test="configType != null and configType != ''">config_type = #{configType},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
- update_time = now()
+ update_time = now()
</set>
where config_id = #{configId}
</update>
-
+
<delete id="deleteConfigById" parameterType="Long">
- delete from sys_config where config_id = #{configId}
+ delete
+ from sys_config
+ where config_id = #{configId}
</delete>
-
+
<delete id="deleteConfigByIds" parameterType="Long">
- delete from sys_config where config_id in
+ delete from sys_config where config_id in
<foreach item="configId" collection="array" open="(" separator="," close=")">
- #{configId}
+ #{configId}
</foreach>
</delete>
<select id="selectByType" parameterType="String" resultMap="SysConfigResult">
- select * from sys_config where config_key = #{sysType}
+ select *
+ from sys_config
+ where config_key = #{sysType}
</select>
-
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3