From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml | 129 ++++++-------------------------------------
1 files changed, 18 insertions(+), 111 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
index 2f0c8be..983125b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -1,112 +1,19 @@
-<?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.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" />
- </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
- </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 concat('%', #{configName}, '%')
- </if>
- <if test="configType != null and configType != ''">
- AND config_type = #{configType}
- </if>
- <if test="configKey != null and configKey != ''">
- AND config_key like concat('%', #{configKey}, '%')
- </if>
- <if test="beginTime != null and beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(create_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d')
- </if>
- <if test="endTime != null and endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
- </if>
- </where>
- </select>
-
- <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
- <include refid="selectConfigVo"/>
- where config_key = #{configKey}
- </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
- )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>
- sysdate()
- )
- </insert>
-
- <update id="updateConfig" parameterType="SysConfig">
- update sys_config
- <set>
- <if test="configName != null and configName != ''">config_name = #{configName},</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 = sysdate()
- </set>
- where config_id = #{configId}
- </update>
-
- <delete id="deleteConfigById" parameterType="Long">
- delete from sys_config where config_id = #{configId}
- </delete>
-
- <delete id="deleteConfigByIds" parameterType="Long">
- delete from sys_config where config_id in
- <foreach item="configId" collection="array" open="(" separator="," close=")">
- #{configId}
- </foreach>
- </delete>
-
+<?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.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"/>
+ </resultMap>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3