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/SysNoticeMapper.xml | 97 +++++++----------------------------------------- 1 files changed, 14 insertions(+), 83 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml index f9d156b..be3cd08 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -1,89 +1,20 @@ <?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.SysNoticeMapper"> - + <resultMap type="SysNotice" id="SysNoticeResult"> - <result property="noticeId" column="notice_id" /> - <result property="noticeTitle" column="notice_title" /> - <result property="noticeType" column="notice_type" /> - <result property="noticeContent" column="notice_content" /> - <result property="status" column="status" /> - <result property="createBy" column="create_by" /> - <result property="createTime" column="create_time" /> - <result property="updateBy" column="update_by" /> - <result property="updateTime" column="update_time" /> - <result property="remark" column="remark" /> + <result property="noticeId" column="notice_id"/> + <result property="noticeTitle" column="notice_title"/> + <result property="noticeType" column="notice_type"/> + <result property="noticeContent" column="notice_content"/> + <result property="status" column="status"/> + <result property="createBy" column="create_by"/> + <result property="createTime" column="create_time"/> + <result property="updateBy" column="update_by"/> + <result property="updateTime" column="update_time"/> + <result property="remark" column="remark"/> </resultMap> - - <sql id="selectNoticeVo"> - select notice_id, notice_title, notice_type, notice_content, status, create_by, create_time, update_by, update_time, remark - from sys_notice - </sql> - - <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult"> - <include refid="selectNoticeVo"/> - where notice_id = #{noticeId} - </select> - - <select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult"> - <include refid="selectNoticeVo"/> - <where> - <if test="noticeTitle != null and noticeTitle != ''"> - AND notice_title like concat('%', #{noticeTitle}, '%') - </if> - <if test="noticeType != null and noticeType != ''"> - AND notice_type = #{noticeType} - </if> - <if test="createBy != null and createBy != ''"> - AND create_by like concat('%', #{createBy}, '%') - </if> - </where> - </select> - - <insert id="insertNotice" parameterType="SysNotice"> - insert into sys_notice ( - <if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if> - <if test="noticeType != null and noticeType != '' ">notice_type, </if> - <if test="noticeContent != null and noticeContent != '' ">notice_content, </if> - <if test="status != null and status != '' ">status, </if> - <if test="remark != null and remark != ''">remark,</if> - <if test="createBy != null and createBy != ''">create_by,</if> - create_time - )values( - <if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if> - <if test="noticeType != null and noticeType != ''">#{noticeType}, </if> - <if test="noticeContent != null and noticeContent != ''">#{noticeContent}, </if> - <if test="status != null and status != ''">#{status}, </if> - <if test="remark != null and remark != ''">#{remark},</if> - <if test="createBy != null and createBy != ''">#{createBy},</if> - sysdate() - ) - </insert> - - <update id="updateNotice" parameterType="SysNotice"> - update sys_notice - <set> - <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if> - <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if> - <if test="noticeContent != null">notice_content = #{noticeContent}, </if> - <if test="status != null and status != ''">status = #{status}, </if> - <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> - update_time = sysdate() - </set> - where notice_id = #{noticeId} - </update> - - <delete id="deleteNoticeById" parameterType="Long"> - delete from sys_notice where notice_id = #{noticeId} - </delete> - - <delete id="deleteNoticeByIds" parameterType="Long"> - delete from sys_notice where notice_id in - <foreach item="noticeId" collection="array" open="(" separator="," close=")"> - #{noticeId} - </foreach> - </delete> - + </mapper> \ No newline at end of file -- Gitblit v1.9.3