diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java index 3608d072a..4a271b216 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java @@ -21,9 +21,7 @@ import java.util.List; @Mapper public interface JobSummaryMapper extends BaseMapper { - int insertBatchJobSummary(@Param("list") List list); - - int updateBatchTriggerAtById(@Param("list") List list); + int insertOrUpdate(@Param("list") List list); IPage jobTaskList(@Param("namespaceId") String namespaceId, Page page); diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java index 8dc259e33..c609070b2 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java @@ -21,9 +21,7 @@ import java.util.List; @Mapper public interface RetrySummaryMapper extends BaseMapper { - int insertBatchRetrySummary(@Param("list") List list); - - int updateBatchSceneNameById(@Param("list") List list); + int insertOrUpdate(@Param("list") List list); DashboardCardResponseDO.RetryTask retryTask(@Param("namespaceId") String namespaceId); diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml index 6c1e80717..18eec6cf6 100644 --- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml +++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml @@ -18,7 +18,7 @@ - + INSERT INTO job_summary (namespace_id, group_name, job_id, trigger_at, success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) @@ -38,40 +38,10 @@ #{item.cancelReason} ) + ON DUPLICATE KEY UPDATE + job_id = values(`job_id`), trigger_at = values(`trigger_at`) - - UPDATE job_summary js, - ( - - SELECT - #{item.namespaceId} AS namespace_id, - #{item.groupName} AS group_name, - #{item.jobId} AS job_id, - #{item.triggerAt} AS trigger_at, - #{item.successNum} AS success_num, - #{item.failNum} AS fail_num, - #{item.failReason} AS fail_reason, - #{item.stopNum} AS stop_num, - #{item.stopReason} AS stop_reason, - #{item.cancelNum} AS cancel_num, - #{item.cancelReason} AS cancel_reason - - ) tt - SET - js.namespace_id = tt.namespace_id, - js.group_name = tt.group_name, - js.job_id = tt.job_id, - js.success_num = tt.success_num, - js.fail_num = tt.fail_num, - js.fail_reason = tt.fail_reason, - js.stop_num = tt.stop_num, - js.stop_reason = tt.stop_reason, - js.cancel_num = tt.cancel_num, - js.cancel_reason = tt.cancel_reason - WHERE js.job_id = tt.job_id AND js.trigger_at = tt.trigger_at - - SELECT ifnull(sum(running_num), 0) AS runningNum, @@ -78,23 +53,20 @@