wangys/schoolNews
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

前端和json优化

Browse Source
This commit is contained in:
wangys
2025-11-28 17:16:17 +08:00
parent 34e69c7f62
commit dfb11c85f1
135 changed files with 930 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
schoolNewsServ/crontab/src/main/resources/mapper/CrontabLogMapper.xml
View File

@@ -4,7 +4,7 @@
<!-- 结果映射 -->
<resultMap id="BaseResultMap" type="org.xyzh.common.dto.crontab.TbCrontabLog">
<id column="id" property="ID" />
<id column="id" property="id" />
<result column="task_id" property="taskId" />
<result column="task_name" property="taskName" />
<result column="task_group" property="taskGroup" />
@@ -34,8 +34,8 @@
<sql id="Base_Where_Clause">
<where>
<if test="filter != null">
<if test="filter.ID != null and filter.ID != ''">
AND id = #{filter.ID}
<if test="filter.id != null and filter.id != ''">
AND id = #{filter.id}
</if>
<if test="filter.taskId != null and filter.taskId != ''">
AND task_id = #{filter.taskId}
@@ -63,7 +63,7 @@
<insert id="insertLog">
INSERT INTO tb_crontab_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="log.ID != null">id,</if>
<if test="log.id != null">id,</if>
<if test="log.taskId != null">task_id,</if>
<if test="log.taskName != null">task_name,</if>
<if test="log.taskGroup != null">task_group,</if>
@@ -81,7 +81,7 @@
</trim>
VALUES
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="log.ID != null">#{log.ID},</if>
<if test="log.id != null">#{log.id},</if>
<if test="log.taskId != null">#{log.taskId},</if>
<if test="log.taskName != null">#{log.taskName},</if>
<if test="log.taskGroup != null">#{log.taskGroup},</if>
@@ -110,7 +110,7 @@
<if test="log.endTime != null">end_time = #{log.endTime},</if>
<if test="log.executeDuration != null">execute_duration = #{log.executeDuration},</if>
update_time = NOW()
WHERE id = #{log.ID} AND deleted = 0
WHERE id = #{log.id} AND deleted = 0
</update>
<!-- 根据ID查询日志 -->

24
schoolNewsServ/crontab/src/main/resources/mapper/CrontabTaskMapper.xml
View File

@@ -4,7 +4,7 @@
<!-- 结果映射 -->
<resultMap id="BaseResultMap" type="org.xyzh.common.dto.crontab.TbCrontabTask">
<id column="id" property="ID" />
<id column="id" property="id" />
<result column="task_id" property="taskId" />
<result column="task_name" property="taskName" />
<result column="task_group" property="taskGroup" />
@@ -66,8 +66,8 @@
<sql id="Filter_Where_Clause">
<where>
<if test="filter != null">
<if test="filter.ID != null and filter.ID != ''">
AND id = #{filter.ID}
<if test="filter.id != null and filter.id != ''">
AND id = #{filter.id}
</if>
<if test="filter.taskId != null and filter.taskId != ''">
AND task_id = #{filter.taskId}
@@ -129,7 +129,7 @@
<insert id="insertTask">
INSERT INTO tb_crontab_task
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="task.ID != null">id,</if>
<if test="task.id != null">id,</if>
<if test="task.taskId != null">task_id,</if>
<if test="task.taskName != null">task_name,</if>
<if test="task.taskGroup != null">task_group,</if>
@@ -149,7 +149,7 @@
</trim>
VALUES
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="task.ID != null">#{task.ID},</if>
<if test="task.id != null">#{task.id},</if>
<if test="task.taskId != null">#{task.taskId},</if>
<if test="task.taskName != null">#{task.taskName},</if>
<if test="task.taskGroup != null">#{task.taskGroup},</if>
@@ -188,7 +188,7 @@
<if test="task.updater != null">updater = #{task.updater},</if>
update_time = NOW()
</set>
WHERE id = #{task.ID} AND deleted = 0
WHERE id = #{task.id} AND deleted = 0
</update>
<!-- 删除任务（逻辑删除） -->
@@ -214,8 +214,8 @@
<include refid="Permission_Filter" />
WHERE ct.deleted = 0
<if test="filter != null">
<if test="filter.ID != null and filter.ID != ''">
AND ct.id = #{filter.ID}
<if test="filter.id != null and filter.id != ''">
AND ct.id = #{filter.id}
</if>
<if test="filter.taskId != null and filter.taskId != ''">
AND ct.task_id = #{filter.taskId}
@@ -264,8 +264,8 @@
ON ct.meta_id = m.meta_id AND m.deleted = 0
WHERE ct.deleted = 0
<if test="filter != null">
<if test="filter.ID != null and filter.ID != ''">
AND ct.id = #{filter.ID}
<if test="filter.id != null and filter.id != ''">
AND ct.id = #{filter.id}
</if>
<if test="filter.taskId != null and filter.taskId != ''">
AND ct.task_id = #{filter.taskId}
@@ -327,8 +327,8 @@
<include refid="Permission_Filter" />
WHERE ct.deleted = 0
<if test="filter != null">
<if test="filter.ID != null and filter.ID != ''">
AND ct.id = #{filter.ID}
<if test="filter.id != null and filter.id != ''">
AND ct.id = #{filter.id}
</if>
<if test="filter.taskId != null and filter.taskId != ''">
AND ct.task_id = #{filter.taskId}

4
schoolNewsServ/crontab/src/main/resources/mapper/EmailDefaultMapper.xml
View File

@@ -4,7 +4,7 @@
<!-- 结果映射 -->
<resultMap id="BaseResultMap" type="org.xyzh.common.dto.crontab.TbCrontabEmailDefault">
<id column="id" property="ID" />
<id column="id" property="id" />
<result column="default_id" property="defaultId" />
<result column="meta_id" property="metaId" />
<result column="user_id" property="userId" />
@@ -29,7 +29,7 @@
INSERT INTO tb_crontab_email_default (
id, default_id, meta_id, user_id, creator, create_time
) VALUES (
#{emailDefault.ID}, #{emailDefault.defaultId}, #{emailDefault.metaId},
#{emailDefault.id}, #{emailDefault.defaultId}, #{emailDefault.metaId},
#{emailDefault.userId}, #{emailDefault.creator}, NOW()
)
</insert>

6
schoolNewsServ/crontab/src/main/resources/mapper/EmailRecipientMapper.xml
View File

@@ -4,7 +4,7 @@
<!-- 结果映射 -->
<resultMap id="BaseResultMap" type="org.xyzh.common.dto.crontab.TbCrontabEmailRecipient">
<id column="id" property="ID" />
<id column="id" property="id" />
<result column="recipient_id" property="recipientId" />
<result column="task_id" property="taskId" />
<result column="user_id" property="userId" />
@@ -48,7 +48,7 @@
INSERT INTO tb_crontab_email_recipient (
id, recipient_id, task_id, user_id, email, name, creator, create_time
) VALUES (
#{recipient.ID}, #{recipient.recipientId}, #{recipient.taskId},
#{recipient.id}, #{recipient.recipientId}, #{recipient.taskId},
#{recipient.userId}, #{recipient.email}, #{recipient.name},
#{recipient.creator}, NOW()
)
@@ -60,7 +60,7 @@
id, recipient_id, task_id, user_id, email, name, creator, create_time
) VALUES
<foreach collection="recipients" item="item" separator=",">
(#{item.ID}, #{item.recipientId}, #{item.taskId},
(#{item.id}, #{item.recipientId}, #{item.taskId},
#{item.userId}, #{item.email}, #{item.name}, #{item.creator}, NOW())
</foreach>
</insert>

4
schoolNewsServ/crontab/src/main/resources/mapper/TaskMetaMapper.xml
View File

@@ -4,7 +4,7 @@
<!-- 结果映射 -->
<resultMap id="BaseResultMap" type="org.xyzh.common.dto.crontab.TbCrontabTaskMeta">
<id column="id" property="ID" />
<id column="id" property="id" />
<result column="meta_id" property="metaId" />
<result column="name" property="name" />
<result column="description" property="description" />
@@ -52,7 +52,7 @@
id, meta_id, name, description, category, bean_name, method_name,
script_path, param_schema, auto_publish, sort_order, creator, create_time
) VALUES (
#{taskMeta.ID}, #{taskMeta.metaId}, #{taskMeta.name}, #{taskMeta.description},
#{taskMeta.id}, #{taskMeta.metaId}, #{taskMeta.name}, #{taskMeta.description},
#{taskMeta.category}, #{taskMeta.beanName}, #{taskMeta.methodName},
#{taskMeta.scriptPath}, #{taskMeta.paramSchema}, #{taskMeta.autoPublish}, #{taskMeta.sortOrder},
#{taskMeta.creator}, NOW()