gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

fix: JobSummaryMapper.updateBatch需要添加system_task_type字段进行区分

Browse Source
This commit is contained in:
dhb52 2024-05-22 22:51:53 +08:00
parent a9725bd5d3
commit 284aa08d1a
5 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml
View File

@ -36,8 +36,9 @@
#{item.stopReason} AS stop_reason, #{item.stopReason} AS stop_reason,
#{item.cancelNum} AS cancel_num, #{item.cancelNum} AS cancel_num,
#{item.cancelReason} AS cancel_reason, #{item.cancelReason} AS cancel_reason,
#{item.triggerAt} AS trigger_at, #{system_task_type} AS system_task_type,
#{item.businessId} AS business_id #{item.businessId} AS business_id,
#{item.triggerAt} AS trigger_at
</foreach> </foreach>
) tt ) tt
SET rt.success_num = tt.success_num, SET rt.success_num = tt.success_num,
@ -47,8 +48,9 @@
rt.stop_reason = tt.stop_reason, rt.stop_reason = tt.stop_reason,
rt.cancel_num = tt.cancel_num, rt.cancel_num = tt.cancel_num,
rt.cancel_reason = tt.cancel_reason rt.cancel_reason = tt.cancel_reason
WHERE rt.trigger_at = tt.trigger_at WHERE rt.system_task_type = tt.system_task_type
AND rt.business_id = tt.business_id AND rt.business_id = tt.business_id
AND rt.trigger_at = tt.trigger_at
</update> </update>
<select id="selectJobLineList" <select id="selectJobLineList"

4
snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml
View File

@ -36,6 +36,7 @@
#{item.stopReason} AS stop_reason, #{item.stopReason} AS stop_reason,
#{item.cancelNum} AS cancel_num, #{item.cancelNum} AS cancel_num,
#{item.cancelReason} AS cancel_reason, #{item.cancelReason} AS cancel_reason,
#{item.systemTaskType} AS system_task_type,
#{item.triggerAt} AS trigger_at, #{item.triggerAt} AS trigger_at,
#{item.businessId} AS business_id #{item.businessId} AS business_id
</foreach> </foreach>
@ -47,8 +48,9 @@
rt.stop_reason = tt.stop_reason, rt.stop_reason = tt.stop_reason,
rt.cancel_num = tt.cancel_num, rt.cancel_num = tt.cancel_num,
rt.cancel_reason = tt.cancel_reason rt.cancel_reason = tt.cancel_reason
WHERE rt.trigger_at = tt.trigger_at WHERE rt.system_task_type = tt.system_task_type
AND rt.business_id = tt.business_id AND rt.business_id = tt.business_id
AND rt.trigger_at = tt.trigger_at
</update> </update>
<select id="selectJobLineList" <select id="selectJobLineList"

5
snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml
View File

@ -4,7 +4,7 @@
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="false" keyProperty="id"> <insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="false" keyProperty="id">
INSERT INTO sj_job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type, INSERT INTO sj_job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type,
success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason)
<foreach collection="list" item="item" separator="UNION ALL"> <foreach collection="list" item="item" separator="UNION ALL">
SELECT SELECT
#{item.namespaceId}, #{item.namespaceId},
@ -33,8 +33,9 @@
stop_reason = #{item.stopReason}, stop_reason = #{item.stopReason},
cancel_num = #{item.cancelNum}, cancel_num = #{item.cancelNum},
cancel_reason = #{item.cancelReason} cancel_reason = #{item.cancelReason}
WHERE trigger_at = #{item.triggerAt} WHERE system_task_type = #{item.systemTaskType}
AND business_id = #{item.businessId} AND business_id = #{item.businessId}
AND trigger_at = #{item.triggerAt}
</foreach> </foreach>
</update> </update>

22
snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobSummaryMapper.xml
View File

@ -36,19 +36,21 @@
FROM ( FROM (
<foreach collection="list" item="item" index="index" separator="UNION ALL"> <foreach collection="list" item="item" index="index" separator="UNION ALL">
SELECT SELECT
#{item.successNum} AS success_num, #{item.successNum} AS success_num,
#{item.failNum} AS fail_num, #{item.failNum} AS fail_num,
#{item.failReason} AS fail_reason, #{item.failReason} AS fail_reason,
#{item.stopNum} AS stop_num, #{item.stopNum} AS stop_num,
#{item.stopReason} AS stop_reason, #{item.stopReason} AS stop_reason,
#{item.cancelNum} AS cancel_num, #{item.cancelNum} AS cancel_num,
#{item.cancelReason} AS cancel_reason, #{item.cancelReason} AS cancel_reason,
#{item.triggerAt} AS trigger_at, #{item.systemTaskType} AS system_task_type,
#{item.businessId} AS business_id #{item.businessId} AS business_id,
#{item.triggerAt} AS trigger_at
</foreach> </foreach>
) AS tt ) AS tt
WHERE rt.trigger_at = tt.trigger_at WHERE rt.system_task_type = tt.system_task_type
AND rt.business_id = tt.business_id AND rt.business_id = tt.business_id
AND rt.trigger_at = tt.trigger_at
</update> </update>
<select id="selectJobLineList" <select id="selectJobLineList"

10
snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml
View File

@ -44,10 +44,14 @@
#{item.stopReason} AS stop_reason, #{item.stopReason} AS stop_reason,
#{item.cancelNum} AS cancel_num, #{item.cancelNum} AS cancel_num,
#{item.cancelReason} AS cancel_reason, #{item.cancelReason} AS cancel_reason,
#{item.triggerAt} AS trigger_at, #{item.systemTaskType} AS system_task_type,
#{item.businessId} AS business_id #{item.businessId} AS business_id,
#{item.triggerAt} AS trigger_at
</foreach> </foreach>
) AS src ON (dest.trigger_at = src.trigger_at AND dest.business_id = src.business_id) ) AS src
ON (dest.system_task_type = src.system_task_type
AND dest.business_id = src.business_id
AND dest.trigger_at = src.trigger_at)
</update> </update>
<select id="selectJobLineList" <select id="selectJobLineList"