From 5c8d95e1802b30c9142c001173d82ac037cb0d3c Mon Sep 17 00:00:00 2001 From: dhb52 Date: Tue, 21 May 2024 15:16:04 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=A7=84=E8=8C=83Mapper=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E5=91=BD=E5=90=8DinsertBatch,updateBatch,selectXxx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/access/TaskAccess.java | 2 +- .../access/task/AbstractTaskAccess.java | 6 ++-- .../task/RetryDeadLetterTaskAccess.java | 2 +- .../access/task/RetryTaskAccess.java | 6 ++-- .../mapper/JobLogMessageMapper.java | 2 +- .../persistence/mapper/JobSummaryMapper.java | 18 +++++------ .../mapper/JobTaskBatchMapper.java | 5 ++-- .../mapper/RetrySummaryMapper.java | 16 +++++----- .../mapper/RetryTaskLogMapper.java | 5 ++-- .../mapper/RetryTaskLogMessageMapper.java | 4 +-- .../persistence/mapper/RetryTaskMapper.java | 2 +- .../persistence/mapper/ServerNodeMapper.java | 7 ++--- .../template/mapper/JobSummaryMapper.xml | 8 ++--- .../template/mapper/JobTaskBatchMapper.xml | 4 +-- .../template/mapper/RetrySummaryMapper.xml | 4 +-- .../template/mapper/RetryTaskLogMapper.xml | 2 +- .../template/mapper/ServerNodeMapper.xml | 2 +- .../mariadb/mapper/JobLogMessageMapper.xml | 2 +- .../mariadb/mapper/JobSummaryMapper.xml | 10 +++---- .../mariadb/mapper/RetrySummaryMapper.xml | 12 ++++---- .../mariadb/mapper/RetryTaskLogMapper.xml | 2 +- .../mapper/RetryTaskLogMessageMapper.xml | 4 +-- .../mariadb/mapper/RetryTaskMapper.xml | 2 +- .../mariadb/mapper/ServerNodeMapper.xml | 4 +-- .../mysql/mapper/JobLogMessageMapper.xml | 2 +- .../mysql/mapper/JobSummaryMapper.xml | 10 +++---- .../mysql/mapper/RetrySummaryMapper.xml | 12 ++++---- .../mysql/mapper/RetryTaskLogMapper.xml | 2 +- .../mapper/RetryTaskLogMessageMapper.xml | 4 +-- .../mysql/mapper/RetryTaskMapper.xml | 2 +- .../mysql/mapper/ServerNodeMapper.xml | 4 +-- .../oracle/mapper/JobLogMessageMapper.xml | 2 +- .../oracle/mapper/JobSummaryMapper.xml | 10 +++---- .../oracle/mapper/RetrySummaryMapper.xml | 12 ++++---- .../oracle/mapper/RetryTaskLogMapper.xml | 2 +- .../mapper/RetryTaskLogMessageMapper.xml | 4 +-- .../oracle/mapper/RetryTaskMapper.xml | 2 +- .../oracle/mapper/ServerNodeMapper.xml | 4 +-- .../postgresql/mapper/JobLogMessageMapper.xml | 2 +- .../postgresql/mapper/JobSummaryMapper.xml | 10 +++---- .../postgresql/mapper/RetrySummaryMapper.xml | 12 ++++---- .../postgresql/mapper/RetryTaskLogMapper.xml | 2 +- .../mapper/RetryTaskLogMessageMapper.xml | 4 +-- .../postgresql/mapper/RetryTaskMapper.xml | 2 +- .../postgresql/mapper/ServerNodeMapper.xml | 4 +-- .../sqlserver/mapper/JobLogMessageMapper.xml | 2 +- .../sqlserver/mapper/JobSummaryMapper.xml | 10 +++---- .../sqlserver/mapper/RetrySummaryMapper.xml | 12 ++++---- .../sqlserver/mapper/RetryTaskLogMapper.xml | 2 +- .../mapper/RetryTaskLogMessageMapper.xml | 4 +-- .../sqlserver/mapper/RetryTaskMapper.xml | 2 +- .../sqlserver/mapper/ServerNodeMapper.xml | 4 +-- .../common/register/AbstractRegister.java | 4 +-- .../task/support/dispatch/JobLogActor.java | 2 +- .../support/schedule/JobLogMergeSchedule.java | 13 ++++---- .../support/schedule/JobSummarySchedule.java | 6 ++-- .../schedule/WorkflowJobSummarySchedule.java | 14 ++++----- .../generator/task/AbstractGenerator.java | 27 ++++++++--------- .../task/service/impl/RetryServiceImpl.java | 2 +- .../dispatch/actor/log/RetryLogActor.java | 2 +- .../schedule/RetryLogMergeSchedule.java | 2 +- .../schedule/RetrySummarySchedule.java | 6 ++-- .../service/impl/DashBoardServiceImpl.java | 30 +++++++++---------- .../impl/RetryDeadLetterServiceImpl.java | 2 +- 64 files changed, 188 insertions(+), 197 deletions(-) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/TaskAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/TaskAccess.java index 96dcd698..e4c28c28 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/TaskAccess.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/TaskAccess.java @@ -26,7 +26,7 @@ public interface TaskAccess extends Access { int insert(String groupName, String namespaceId, T t); - int batchInsert(String groupName, String namespaceId, List list); + int insertBatch(String groupName, String namespaceId, List list); PageDTO listPage(String groupName, String namespaceId, PageDTO iPage, LambdaQueryWrapper query); diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/AbstractTaskAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/AbstractTaskAccess.java index df0ba831..44f2a798 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/AbstractTaskAccess.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/AbstractTaskAccess.java @@ -71,12 +71,12 @@ public abstract class AbstractTaskAccess implements TaskAccess { } @Override - public int batchInsert(String groupName, String namespaceId, List list) { + public int insertBatch(String groupName, String namespaceId, List list) { setPartition(groupName, namespaceId); - return doBatchInsert(list); + return doInsertBatch(list); } - protected abstract int doBatchInsert(List list); + protected abstract int doInsertBatch(List list); @Override public PageDTO listPage(String groupName, String namespaceId, final PageDTO iPage, final LambdaQueryWrapper query) { diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/RetryDeadLetterTaskAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/RetryDeadLetterTaskAccess.java index 3ccdff8e..7dbd5070 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/RetryDeadLetterTaskAccess.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/RetryDeadLetterTaskAccess.java @@ -38,7 +38,7 @@ public class RetryDeadLetterTaskAccess extends AbstractTaskAccess list) { + protected int doInsertBatch(List list) { return retryDeadLetterMapper.insertBatch(list); } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/RetryTaskAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/RetryTaskAccess.java index 5417f943..db962164 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/RetryTaskAccess.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/RetryTaskAccess.java @@ -4,8 +4,6 @@ import com.aizuda.snailjob.template.datasource.enums.DbTypeEnum; import com.aizuda.snailjob.template.datasource.enums.OperationTypeEnum; import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper; import com.aizuda.snailjob.template.datasource.persistence.po.RetryTask; -import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper; -import com.aizuda.snailjob.template.datasource.persistence.po.RetryTask; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; @@ -40,8 +38,8 @@ public class RetryTaskAccess extends AbstractTaskAccess { } @Override - protected int doBatchInsert(List list) { - return retryTaskMapper.batchInsert(list); + protected int doInsertBatch(List list) { + return retryTaskMapper.insertBatch(list); } @Override diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobLogMessageMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobLogMessageMapper.java index 4fb380be..f91f1a1f 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobLogMessageMapper.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobLogMessageMapper.java @@ -17,5 +17,5 @@ import java.util.List; @Mapper public interface JobLogMessageMapper extends BaseMapper { - int batchInsert(List list); + int insertBatch(List list); } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobSummaryMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobSummaryMapper.java index 3c7c4bfc..b6f49eed 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobSummaryMapper.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobSummaryMapper.java @@ -23,24 +23,24 @@ import java.util.List; @Mapper public interface JobSummaryMapper extends BaseMapper { - int batchInsert(@Param("list") List list); + int insertBatch(@Param("list") List list); - int batchUpdate(@Param("list") List list); + int updateBatch(@Param("list") List list); - IPage jobTaskList(@Param("ew") Wrapper wrapper, Page page); + IPage selectJobTaskList(@Param("ew") Wrapper wrapper, Page page); // jobTaskList 自定义 countStatement - long jobTaskListCount(@Param("ew") Wrapper wrapper); + long selectJobTaskListCount(@Param("ew") Wrapper wrapper); - IPage workflowTaskList(@Param("ew") Wrapper wrapper, Page page); + IPage selectWorkflowTaskList(@Param("ew") Wrapper wrapper, Page page); // workflowTaskList 自定义 countStatement - long workflowTaskListCount(@Param("ew") Wrapper wrapper); + long selectWorkflowTaskListCount(@Param("ew") Wrapper wrapper); - List jobLineList(@Param("dateFormat") String dateFormat, @Param("ew") Wrapper wrapper); + List selectJobLineList(@Param("dateFormat") String dateFormat, @Param("ew") Wrapper wrapper); - List dashboardRank(@Param("systemTaskType") Integer systemTaskType, @Param("ew") Wrapper wrapper); + List selectDashboardRankList(@Param("systemTaskType") Integer systemTaskType, @Param("ew") Wrapper wrapper); - DashboardCardResponseDO.JobTask toJobTask(@Param("ew") Wrapper wrapper); + DashboardCardResponseDO.JobTask selectJobTask(@Param("ew") Wrapper wrapper); } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobTaskBatchMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobTaskBatchMapper.java index 4f170b14..8c3ad903 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobTaskBatchMapper.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobTaskBatchMapper.java @@ -4,7 +4,6 @@ import com.aizuda.snailjob.template.datasource.persistence.dataobject.JobBatchRe import com.aizuda.snailjob.template.datasource.persistence.dataobject.JobBatchSummaryResponseDO; import com.aizuda.snailjob.template.datasource.persistence.po.JobTaskBatch; import com.aizuda.snailjob.template.datasource.persistence.po.WorkflowTaskBatch; -import com.aizuda.snailjob.template.datasource.persistence.dataobject.JobBatchSummaryResponseDO; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -28,7 +27,7 @@ public interface JobTaskBatchMapper extends BaseMapper { List selectJobBatchListByIds(@Param("ew") Wrapper wrapper); - List summaryJobBatchList(@Param("ew") Wrapper wrapper); + List selectJobBatchSummaryList(@Param("ew") Wrapper wrapper); - List summaryWorkflowTaskBatchList(@Param("ew") Wrapper wrapper); + List selectWorkflowTaskBatchSummaryList(@Param("ew") Wrapper wrapper); } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetrySummaryMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetrySummaryMapper.java index b66dec30..2412c811 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetrySummaryMapper.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetrySummaryMapper.java @@ -22,20 +22,20 @@ import java.util.List; @Mapper public interface RetrySummaryMapper extends BaseMapper { - int batchInsert(@Param("list") List list); + int insertBatch(@Param("list") List list); - int batchUpdate(@Param("list") List list); + int updateBatch(@Param("list") List list); - DashboardCardResponseDO.RetryTask retryTask(@Param("ew") Wrapper wrapper); + DashboardCardResponseDO.RetryTask selectRetryTask(@Param("ew") Wrapper wrapper); - List retryTaskBarList(@Param("ew") Wrapper wrapper); + List selectRetryTaskBarList(@Param("ew") Wrapper wrapper); - IPage retryTaskList(@Param("ew") Wrapper wrapper, Page page); + IPage selectRetryTaskList(@Param("ew") Wrapper wrapper, Page page); - long retryTaskListCount(@Param("ew") Wrapper wrapper); + long selectRetryTaskListCount(@Param("ew") Wrapper wrapper); - List retryLineList(@Param("dateFormat") String dateFormat, @Param("ew") Wrapper wrapper); + List selectRetryLineList(@Param("dateFormat") String dateFormat, @Param("ew") Wrapper wrapper); - List dashboardRank(@Param("ew") Wrapper wrapper); + List selectDashboardRankList(@Param("ew") Wrapper wrapper); } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMapper.java index 3a0be0bd..5238a6b1 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMapper.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMapper.java @@ -3,7 +3,6 @@ package com.aizuda.snailjob.template.datasource.persistence.mapper; import com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryResponseDO; import com.aizuda.snailjob.template.datasource.persistence.po.RetryTaskLog; -import com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryResponseDO; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -12,7 +11,7 @@ import java.util.List; public interface RetryTaskLogMapper extends BaseMapper { - int batchInsert(List list); + int insertBatch(List list); - List retrySummaryRetryTaskLogList(@Param("ew") Wrapper wrapper); + List selectRetryRetryTaskLogSummaryList(@Param("ew") Wrapper wrapper); } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMessageMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMessageMapper.java index 6ec2b4c1..820baf4f 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMessageMapper.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMessageMapper.java @@ -17,7 +17,7 @@ import java.util.List; @Mapper public interface RetryTaskLogMessageMapper extends BaseMapper { - int batchInsert(List list); + int insertBatch(List list); - int batchUpdate(List list); + int updateBatch(List list); } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskMapper.java index d7866aed..d769f9ed 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskMapper.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskMapper.java @@ -8,7 +8,7 @@ import java.util.List; public interface RetryTaskMapper extends BaseMapper { - int batchInsert(@Param("list") List list); + int insertBatch(@Param("list") List list); int updateBatchNextTriggerAtById(@Param("partition") Integer partition, @Param("list") List list); } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/ServerNodeMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/ServerNodeMapper.java index f7b8c262..07da7d02 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/ServerNodeMapper.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/ServerNodeMapper.java @@ -2,7 +2,6 @@ package com.aizuda.snailjob.template.datasource.persistence.mapper; import com.aizuda.snailjob.template.datasource.persistence.dataobject.ActivePodQuantityResponseDO; import com.aizuda.snailjob.template.datasource.persistence.po.ServerNode; -import com.aizuda.snailjob.template.datasource.persistence.dataobject.ActivePodQuantityResponseDO; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -13,10 +12,10 @@ import java.util.List; @Mapper public interface ServerNodeMapper extends BaseMapper { - int batchUpdateExpireAt(@Param("list") List list); + int updateBatchExpireAt(@Param("list") List list); - int batchInsert(@Param("records") List records); + int insertBatch(@Param("records") List records); - List countActivePod(@Param("ew") Wrapper wrapper); + List selectActivePodCount(@Param("ew") Wrapper wrapper); } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobSummaryMapper.xml index e8860cdc..1aa85763 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobSummaryMapper.xml +++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobSummaryMapper.xml @@ -2,7 +2,7 @@ - - SELECT COUNT(DISTINCT group_name) FROM sj_job ${ew.customSqlSegment} - - SELECT COUNT(DISTINCT group_name) FROM sj_workflow ${ew.customSqlSegment} diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobTaskBatchMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobTaskBatchMapper.xml index b7faabcd..f1486b8e 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobTaskBatchMapper.xml +++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobTaskBatchMapper.xml @@ -17,7 +17,7 @@ ${ew.customSqlSegment} - - SELECT group_name AS groupName, SUM(CASE WHEN (scene_status = 1) THEN 1 ELSE 0 END) AS run, @@ -13,7 +13,7 @@ ORDER BY group_name - SELECT COUNT(DISTINCT group_name) FROM sj_retry_scene_config ${ew.customSqlSegment} diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml index 6bd17dac..9004a1e4 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml +++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml @@ -3,7 +3,7 @@ - SELECT node_type AS nodeType, COUNT(*) AS total diff --git a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml index 194f1035..8c764b8e 100644 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml @@ -2,7 +2,7 @@ - + INSERT INTO sj_job_log_message (namespace_id, group_name, job_id, task_batch_id, task_id, log_num, message, create_dt, real_time) VALUES diff --git a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml index 0aefb526..fe3f61e8 100644 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml @@ -2,7 +2,7 @@ - + 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) VALUES @@ -24,7 +24,7 @@ - + UPDATE sj_job_summary rt, ( @@ -51,7 +51,7 @@ AND rt.business_id = tt.business_id - - - SELECT IFNULL(SUM(running_num), 0) AS runningNum, IFNULL(SUM(finish_num), 0) AS finishNum, @@ -56,7 +56,7 @@ ${ew.customSqlSegment} - - - SELECT DATE_FORMAT(trigger_at, #{dateFormat}) AS createDt, IFNULL(SUM(success_num), 0) AS success, @@ -64,7 +64,7 @@ GROUP BY DATE_FORMAT(trigger_at, #{dateFormat}) - - SELECT IFNULL(SUM(running_num), 0) AS runningNum, IFNULL(SUM(finish_num), 0) AS finishNum, @@ -56,7 +56,7 @@ ${ew.customSqlSegment} - - - SELECT createDt AS createDt, NVL(SUM(success_num), 0) AS success, @@ -60,7 +60,7 @@ GROUP BY createDt - - SELECT NVL(SUM(running_num), 0) AS runningNum, NVL(SUM(finish_num), 0) AS finishNum, @@ -44,7 +44,7 @@ ${ew.customSqlSegment} - - - SELECT TO_CHAR(trigger_at, #{dateFormat}) AS createDt, COALESCE(SUM(success_num), 0) AS success, @@ -65,7 +65,7 @@ GROUP BY createDt - - SELECT COALESCE(sum(running_num), 0) AS runningNum, COALESCE(sum(finish_num), 0) AS finishNum, @@ -56,7 +56,7 @@ ${ew.customSqlSegment} - - - SELECT createDt AS createDt, ISNULL(SUM(success_num), 0) AS success, @@ -70,7 +70,7 @@ GROUP BY createDt - - SELECT ISNULL(SUM(running_num), 0) AS runningNum, ISNULL(SUM(finish_num), 0) AS finishNum, @@ -56,7 +56,7 @@ ${ew.customSqlSegment} - - -