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

refactor: 规范Mapper函数命名insertBatch,updateBatch,selectXxx

Browse Source
This commit is contained in:
dhb52 2024-05-21 15:16:04 +08:00
parent 561f0efd13
commit 5c8d95e180
64 changed files with 188 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/TaskAccess.java
View File

@ -26,7 +26,7 @@ public interface TaskAccess<T> extends Access<T> {
int insert(String groupName, String namespaceId, T t);
int batchInsert(String groupName, String namespaceId, List<T> list);
int insertBatch(String groupName, String namespaceId, List<T> list);
PageDTO<T> listPage(String groupName, String namespaceId, PageDTO<T> iPage, LambdaQueryWrapper<T> query);

6
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/AbstractTaskAccess.java
View File

@ -71,12 +71,12 @@ public abstract class AbstractTaskAccess<T> implements TaskAccess<T> {
}
@Override
public int batchInsert(String groupName, String namespaceId, List<T> list) {
public int insertBatch(String groupName, String namespaceId, List<T> list) {
setPartition(groupName, namespaceId);
return doBatchInsert(list);
return doInsertBatch(list);
}
protected abstract int doBatchInsert(List<T> list);
protected abstract int doInsertBatch(List<T> list);
@Override
public PageDTO<T> listPage(String groupName, String namespaceId, final PageDTO<T> iPage, final LambdaQueryWrapper<T> query) {

2
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/RetryDeadLetterTaskAccess.java
View File

@ -38,7 +38,7 @@ public class RetryDeadLetterTaskAccess extends AbstractTaskAccess<RetryDeadLette
}
@Override
protected int doBatchInsert(List<RetryDeadLetter> list) {
protected int doInsertBatch(List<RetryDeadLetter> list) {
return retryDeadLetterMapper.insertBatch(list);
}

6
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/task/RetryTaskAccess.java
View File

@ -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<RetryTask> {
}
@Override
protected int doBatchInsert(List<RetryTask> list) {
return retryTaskMapper.batchInsert(list);
protected int doInsertBatch(List<RetryTask> list) {
return retryTaskMapper.insertBatch(list);
}
@Override

2
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobLogMessageMapper.java
View File

@ -17,5 +17,5 @@ import java.util.List;
@Mapper
public interface JobLogMessageMapper extends BaseMapper<JobLogMessage> {
int batchInsert(List<JobLogMessage> list);
int insertBatch(List<JobLogMessage> list);
}

18
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobSummaryMapper.java
View File

@ -23,24 +23,24 @@ import java.util.List;
@Mapper
public interface JobSummaryMapper extends BaseMapper<JobSummary> {
int batchInsert(@Param("list") List<JobSummary> list);
int insertBatch(@Param("list") List<JobSummary> list);
int batchUpdate(@Param("list") List<JobSummary> list);
int updateBatch(@Param("list") List<JobSummary> list);
IPage<Task> jobTaskList(@Param("ew") Wrapper<Job> wrapper, Page<Object> page);
IPage<Task> selectJobTaskList(@Param("ew") Wrapper<Job> wrapper, Page<Object> page);
// jobTaskList 自定义 countStatement
long jobTaskListCount(@Param("ew") Wrapper<Job> wrapper);
long selectJobTaskListCount(@Param("ew") Wrapper<Job> wrapper);
IPage<Task> workflowTaskList(@Param("ew") Wrapper<Job> wrapper, Page<Object> page);
IPage<Task> selectWorkflowTaskList(@Param("ew") Wrapper<Job> wrapper, Page<Object> page);
// workflowTaskList 自定义 countStatement
long workflowTaskListCount(@Param("ew") Wrapper<Job> wrapper);
long selectWorkflowTaskListCount(@Param("ew") Wrapper<Job> wrapper);
List<DashboardLineResponseDO> jobLineList(@Param("dateFormat") String dateFormat, @Param("ew") Wrapper<JobSummary> wrapper);
List<DashboardLineResponseDO> selectJobLineList(@Param("dateFormat") String dateFormat, @Param("ew") Wrapper<JobSummary> wrapper);
List<Rank> dashboardRank(@Param("systemTaskType") Integer systemTaskType, @Param("ew") Wrapper<JobSummary> wrapper);
List<Rank> selectDashboardRankList(@Param("systemTaskType") Integer systemTaskType, @Param("ew") Wrapper<JobSummary> wrapper);
DashboardCardResponseDO.JobTask toJobTask(@Param("ew") Wrapper<JobSummary> wrapper);
DashboardCardResponseDO.JobTask selectJobTask(@Param("ew") Wrapper<JobSummary> wrapper);
}

5
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/JobTaskBatchMapper.java
View File

@ -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<JobTaskBatch> {
List<JobBatchResponseDO> selectJobBatchListByIds(@Param("ew") Wrapper<JobTaskBatch> wrapper);
List<JobBatchSummaryResponseDO> summaryJobBatchList(@Param("ew") Wrapper<JobTaskBatch> wrapper);
List<JobBatchSummaryResponseDO> selectJobBatchSummaryList(@Param("ew") Wrapper<JobTaskBatch> wrapper);
List<JobBatchSummaryResponseDO> summaryWorkflowTaskBatchList(@Param("ew") Wrapper<WorkflowTaskBatch> wrapper);
List<JobBatchSummaryResponseDO> selectWorkflowTaskBatchSummaryList(@Param("ew") Wrapper<WorkflowTaskBatch> wrapper);
}

16
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetrySummaryMapper.java
View File

@ -22,20 +22,20 @@ import java.util.List;
@Mapper
public interface RetrySummaryMapper extends BaseMapper<RetrySummary> {
int batchInsert(@Param("list") List<RetrySummary> list);
int insertBatch(@Param("list") List<RetrySummary> list);
int batchUpdate(@Param("list") List<RetrySummary> list);
int updateBatch(@Param("list") List<RetrySummary> list);
DashboardCardResponseDO.RetryTask retryTask(@Param("ew") Wrapper<RetrySummary> wrapper);
DashboardCardResponseDO.RetryTask selectRetryTask(@Param("ew") Wrapper<RetrySummary> wrapper);
List<DashboardCardResponseDO.RetryTask> retryTaskBarList(@Param("ew") Wrapper<RetrySummary> wrapper);
List<DashboardCardResponseDO.RetryTask> selectRetryTaskBarList(@Param("ew") Wrapper<RetrySummary> wrapper);
IPage<DashboardRetryLineResponseDO.Task> retryTaskList(@Param("ew") Wrapper<RetrySceneConfig> wrapper, Page<Object> page);
IPage<DashboardRetryLineResponseDO.Task> selectRetryTaskList(@Param("ew") Wrapper<RetrySceneConfig> wrapper, Page<Object> page);
long retryTaskListCount(@Param("ew") Wrapper<RetrySceneConfig> wrapper);
long selectRetryTaskListCount(@Param("ew") Wrapper<RetrySceneConfig> wrapper);
List<DashboardLineResponseDO> retryLineList(@Param("dateFormat") String dateFormat, @Param("ew") Wrapper<RetrySummary> wrapper);
List<DashboardLineResponseDO> selectRetryLineList(@Param("dateFormat") String dateFormat, @Param("ew") Wrapper<RetrySummary> wrapper);
List<DashboardRetryLineResponseDO.Rank> dashboardRank(@Param("ew") Wrapper<RetrySummary> wrapper);
List<DashboardRetryLineResponseDO.Rank> selectDashboardRankList(@Param("ew") Wrapper<RetrySummary> wrapper);
}

5
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMapper.java
View File

@ -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<RetryTaskLog> {
int batchInsert(List<RetryTaskLog> list);
int insertBatch(List<RetryTaskLog> list);
List<DashboardRetryResponseDO> retrySummaryRetryTaskLogList(@Param("ew") Wrapper<RetryTaskLog> wrapper);
List<DashboardRetryResponseDO> selectRetryRetryTaskLogSummaryList(@Param("ew") Wrapper<RetryTaskLog> wrapper);
}

4
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMessageMapper.java
View File

@ -17,7 +17,7 @@ import java.util.List;
@Mapper
public interface RetryTaskLogMessageMapper extends BaseMapper<RetryTaskLogMessage> {
int batchInsert(List<RetryTaskLogMessage> list);
int insertBatch(List<RetryTaskLogMessage> list);
int batchUpdate(List<RetryTaskLogMessage> list);
int updateBatch(List<RetryTaskLogMessage> list);
}

2
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskMapper.java
View File

@ -8,7 +8,7 @@ import java.util.List;
public interface RetryTaskMapper extends BaseMapper<RetryTask> {
int batchInsert(@Param("list") List<RetryTask> list);
int insertBatch(@Param("list") List<RetryTask> list);
int updateBatchNextTriggerAtById(@Param("partition") Integer partition, @Param("list") List<RetryTask> list);
}

7
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/ServerNodeMapper.java
View File

@ -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<ServerNode> {
int batchUpdateExpireAt(@Param("list") List<ServerNode> list);
int updateBatchExpireAt(@Param("list") List<ServerNode> list);
int batchInsert(@Param("records") List<ServerNode> records);
int insertBatch(@Param("records") List<ServerNode> records);
List<ActivePodQuantityResponseDO> countActivePod(@Param("ew") Wrapper<ServerNode> wrapper);
List<ActivePodQuantityResponseDO> selectActivePodCount(@Param("ew") Wrapper<ServerNode> wrapper);
}

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

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.JobSummaryMapper">
<select id="jobTaskList"
<select id="selectJobTaskList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Task">
SELECT group_name AS groupName,
SUM(CASE WHEN (job_status = 1) THEN 1 ELSE 0 END) AS run,
@ -13,13 +13,13 @@
ORDER BY group_name
</select>
<select id="jobTaskListCount" resultType="long">
<select id="selectJobTaskListCount" resultType="long">
SELECT COUNT(DISTINCT group_name)
FROM sj_job
${ew.customSqlSegment}
</select>
<select id="workflowTaskList"
<select id="selectWorkflowTaskList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Task">
SELECT group_name AS groupName,
SUM(CASE WHEN (workflow_status = 1) THEN 1 ELSE 0 END) AS run,
@ -30,7 +30,7 @@
ORDER BY group_name
</select>
<select id="workflowTaskListCount" resultType="long">
<select id="selectWorkflowTaskListCount" resultType="long">
SELECT COUNT(DISTINCT group_name)
FROM sj_workflow
${ew.customSqlSegment}

4
snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobTaskBatchMapper.xml
View File

@ -17,7 +17,7 @@
${ew.customSqlSegment}
</select>
<select id="summaryJobBatchList"
<select id="selectJobBatchSummaryList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.JobBatchSummaryResponseDO">
SELECT namespace_id AS namespaceId,
job_id AS jobId,
@ -33,7 +33,7 @@
${ew.customSqlSegment}
</select>
<select id="summaryWorkflowTaskBatchList"
<select id="selectWorkflowTaskBatchSummaryList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.JobBatchSummaryResponseDO">
SELECT namespace_id AS namespaceId,
workflow_id AS jobId,

4
snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetrySummaryMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetrySummaryMapper">
<select id="retryTaskList"
<select id="selectRetryTaskList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Task">
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>
<select id="retryTaskListCount" resultType="long">
<select id="selectRetryTaskListCount" resultType="long">
SELECT COUNT(DISTINCT group_name)
FROM sj_retry_scene_config
${ew.customSqlSegment}

2
snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMapper">
<!-- 重试统计 -->
<select id="retrySummaryRetryTaskLogList"
<select id="selectRetryRetryTaskLogSummaryList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryResponseDO">
SELECT namespace_id AS namespaceId,
group_name AS groupName,

2
snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/ServerNodeMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.ServerNodeMapper">
<select id="countActivePod"
<select id="selectActivePodCount"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.ActivePodQuantityResponseDO">
SELECT node_type AS nodeType,
COUNT(*) AS total

2
snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.JobLogMessageMapper">
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
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

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

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.JobSummaryMapper">
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
UPDATE sj_job_summary rt,
(
<foreach collection="list" item="item" index="index" separator="UNION ALL">
@ -51,7 +51,7 @@
AND rt.business_id = tt.business_id
</update>
<select id="jobLineList"
<select id="selectJobLineList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardLineResponseDO">
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>
<select id="toJobTask"
<select id="selectJobTask"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$JobTask">
SELECT IFNULL(SUM(success_num), 0) AS successNum,
IFNULL(SUM(stop_num), 0) AS stopNum,
@ -75,7 +75,7 @@
${ew.customSqlSegment}
</select>
<select id="dashboardRank"
<select id="selectDashboardRankList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
SELECT
<if test="systemTaskType == 3">

12
snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetrySummaryMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetrySummaryMapper">
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
INSERT INTO sj_retry_summary (namespace_id, group_name, scene_name, trigger_at,
running_num, finish_num, max_count_num, suspend_num)
VALUES
@ -20,7 +20,7 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
UPDATE sj_retry_summary rt,
(
<foreach collection="list" item="item" index="index" separator="UNION ALL">
@ -45,7 +45,7 @@
AND rt.scene_name = tt.scene_name
</update>
<select id="retryTask"
<select id="selectRetryTask"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$RetryTask">
SELECT IFNULL(SUM(running_num), 0) AS runningNum,
IFNULL(SUM(finish_num), 0) AS finishNum,
@ -56,7 +56,7 @@
${ew.customSqlSegment}
</select>
<select id="retryTaskBarList"
<select id="selectRetryTaskBarList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$RetryTask">
SELECT trigger_at,
running_num,
@ -68,7 +68,7 @@
LIMIT 7
</select>
<select id="retryLineList"
<select id="selectRetryLineList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardLineResponseDO">
SELECT DATE_FORMAT(create_dt, #{dateFormat}) AS createDt,
IFNULL(SUM(finish_num), 0) AS successNum,
@ -81,7 +81,7 @@
GROUP BY createDt
</select>
<select id="dashboardRank"
<select id="selectDashboardRankList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
SELECT CONCAT(group_name, '/', scene_name) AS name,
SUM(running_num + finish_num + max_count_num + suspend_num) AS total

2
snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskLogMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_retry_task_log (unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name,
args_str, ext_attrs, task_type, create_dt, namespace_id)
VALUES

4
snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskLogMessageMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMessageMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_retry_task_log_message (namespace_id, group_name, unique_id, log_num, message,
create_dt, real_time)
VALUES
@ -20,7 +20,7 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
UPDATE sj_retry_task_log_message rt,
(
<foreach collection="list" item="item" index="index" separator="UNION ALL">

2
snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_retry_task (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no,
executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status,
create_dt)

4
snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/ServerNodeMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.ServerNodeMapper">
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
INSERT INTO sj_server_node (namespace_id, group_name, host_id, host_ip, host_port,
expire_at, node_type, ext_attrs, create_dt)
VALUES
@ -21,7 +21,7 @@
</foreach>
</insert>
<update id="batchUpdateExpireAt" parameterType="java.util.List">
<update id="updateBatchExpireAt" parameterType="java.util.List">
UPDATE sj_server_node rt,
(
<foreach collection="list" item="item" index="index" separator="UNION ALL">

2
snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobLogMessageMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.JobLogMessageMapper">
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
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

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

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.JobSummaryMapper">
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
UPDATE sj_job_summary rt,
(
<foreach collection="list" item="item" index="index" separator="UNION ALL">
@ -51,7 +51,7 @@
AND rt.business_id = tt.business_id
</update>
<select id="jobLineList"
<select id="selectJobLineList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardLineResponseDO">
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>
<select id="toJobTask"
<select id="selectJobTask"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$JobTask">
SELECT IFNULL(SUM(success_num), 0) AS successNum,
IFNULL(SUM(stop_num), 0) AS stopNum,
@ -75,7 +75,7 @@
${ew.customSqlSegment}
</select>
<select id="dashboardRank"
<select id="selectDashboardRankList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
SELECT
<if test="systemTaskType == 3">

12
snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetrySummaryMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetrySummaryMapper">
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
INSERT INTO sj_retry_summary (namespace_id, group_name, scene_name, trigger_at,
running_num, finish_num, max_count_num, suspend_num)
VALUES
@ -20,7 +20,7 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
UPDATE sj_retry_summary rt,
(
<foreach collection="list" item="item" index="index" separator="UNION ALL">
@ -45,7 +45,7 @@
AND rt.scene_name = tt.scene_name
</update>
<select id="retryTask"
<select id="selectRetryTask"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$RetryTask">
SELECT IFNULL(SUM(running_num), 0) AS runningNum,
IFNULL(SUM(finish_num), 0) AS finishNum,
@ -56,7 +56,7 @@
${ew.customSqlSegment}
</select>
<select id="retryTaskBarList"
<select id="selectRetryTaskBarList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$RetryTask">
SELECT trigger_at,
running_num,
@ -68,7 +68,7 @@
LIMIT 7
</select>
<select id="retryLineList"
<select id="selectRetryLineList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardLineResponseDO">
SELECT DATE_FORMAT(create_dt, #{dateFormat}) AS createDt,
IFNULL(SUM(finish_num), 0) AS successNum,
@ -81,7 +81,7 @@
GROUP BY createDt
</select>
<select id="dashboardRank"
<select id="selectDashboardRankList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
SELECT CONCAT(group_name, '/', scene_name) AS name,
SUM(running_num + finish_num + max_count_num + suspend_num) AS total

2
snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskLogMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_retry_task_log (unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name,
args_str, ext_attrs, task_type, create_dt, namespace_id)
VALUES

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

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMessageMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_retry_task_log_message (namespace_id, group_name, unique_id, log_num, message,
create_dt, real_time)
VALUES
@ -20,7 +20,7 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
UPDATE sj_retry_task_log_message rt,
(
<foreach collection="list" item="item" index="index" separator="UNION ALL">

2
snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_retry_task (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no,
executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status,
create_dt)

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

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.ServerNodeMapper">
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
INSERT INTO sj_server_node (namespace_id, group_name, host_id, host_ip, host_port,
expire_at, node_type, ext_attrs, create_dt)
VALUES
@ -21,7 +21,7 @@
</foreach>
</insert>
<update id="batchUpdateExpireAt" parameterType="java.util.List">
<update id="updateBatchExpireAt" parameterType="java.util.List">
UPDATE sj_server_node rt,
(
<foreach collection="list" item="item" index="index" separator="UNION ALL">

2
snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobLogMessageMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.JobLogMessageMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_job_log_message (namespace_id, group_name, job_id, task_batch_id, task_id,
log_num, message, create_dt, real_time)
<foreach collection="list" item="item" separator="UNION ALL">

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

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.JobSummaryMapper">
<insert id="batchInsert" 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,
success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason)
<foreach collection="list" item="item" separator="UNION ALL">
@ -23,7 +23,7 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
<foreach collection="list" item="item" index="index" open="BEGIN" separator=";" close=";END;">
UPDATE sj_job_summary
SET success_num = #{item.successNum},
@ -38,7 +38,7 @@
</foreach>
</update>
<select id="jobLineList"
<select id="selectJobLineList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardLineResponseDO">
SELECT createDt AS createDt,
NVL(SUM(success_num), 0) AS success,
@ -60,7 +60,7 @@
GROUP BY createDt
</select>
<select id="toJobTask"
<select id="selectJobTask"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$JobTask">
SELECT NVL(sum(success_num), 0) AS successNum,
NVL(sum(stop_num), 0) AS stopNum,
@ -71,7 +71,7 @@
${ew.customSqlSegment}
</select>
<select id="dashboardRank"
<select id="selectDashboardRankList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
SELECT * FROM (
SELECT

12
snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetrySummaryMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetrySummaryMapper">
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="false" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="false" keyProperty="id">
INSERT INTO sj_retry_summary (namespace_id, group_name, scene_name, trigger_at,
running_num, finish_num, max_count_num, suspend_num)
<foreach collection="list" item="item" separator="UNION ALL">
@ -19,7 +19,7 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
<foreach collection="list" item="item" index="index" open="BEGIN" separator=";" close=";END;">
UPDATE sj_retry_summary
SET running_num = #{item.runningNum},
@ -33,7 +33,7 @@
</foreach>
</update>
<select id="retryTask"
<select id="selectRetryTask"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$RetryTask">
SELECT NVL(SUM(running_num), 0) AS runningNum,
NVL(SUM(finish_num), 0) AS finishNum,
@ -44,7 +44,7 @@
${ew.customSqlSegment}
</select>
<select id="retryTaskBarList"
<select id="selectRetryTaskBarList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$RetryTask">
SELECT *
FROM
@ -60,7 +60,7 @@
WHERE ROWNUM <![CDATA[ <= ]]> 7
</select>
<select id="retryLineList"
<select id="selectRetryLineList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardLineResponseDO">
SELECT createDt AS createDt,
NVL(SUM(finish_num), 0) AS successNum,
@ -81,7 +81,7 @@
GROUP BY createDt
</select>
<select id="dashboardRank"
<select id="selectDashboardRankList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
SELECT
*

2
snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="false" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="false" keyProperty="id">
INSERT INTO sj_retry_task_log (unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name,
args_str, ext_attrs, task_type, create_dt, namespace_id)
<foreach collection="list" item="item" separator="UNION ALL">

4
snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMessageMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMessageMapper">
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_retry_task_log_message (namespace_id, group_name, unique_id, log_num, message,
create_dt, real_time)
<foreach collection="list" item="item" separator="UNION ALL">
@ -18,7 +18,7 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
<foreach collection="list" item="item" index="index" open="BEGIN" separator=";" close=";END;">
UPDATE sj_retry_task_log_message
SET message = #{item.message}, log_num = #{item.logNum}

2
snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_retry_task (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no,
executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, create_dt)
<foreach collection="list" item="item" separator="UNION ALL">

4
snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/ServerNodeMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.ServerNodeMapper">
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="false" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="false" keyProperty="id">
<!-- useGeneratedKeys="false" 否则报错ORA-00933: SQL command not properly ended -->
INSERT INTO sj_server_node (namespace_id, group_name, host_id, host_ip, host_port,
expire_at, node_type, ext_attrs, create_dt)
@ -21,7 +21,7 @@
</foreach>
</insert>
<update id="batchUpdateExpireAt" parameterType="java.util.List">
<update id="updateBatchExpireAt" parameterType="java.util.List">
<foreach collection="list" item="item" open="BEGIN" separator=";" close=";END;">
UPDATE sj_server_node
SET expire_at = #{item.expireAt}

2
snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobLogMessageMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.JobLogMessageMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
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

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

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.JobSummaryMapper">
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
UPDATE sj_job_summary AS rt
SET success_num = tt.success_num,
fail_num = tt.fail_num,
@ -51,7 +51,7 @@
AND rt.business_id = tt.business_id
</update>
<select id="jobLineList"
<select id="selectJobLineList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardLineResponseDO">
SELECT TO_CHAR(trigger_at, #{dateFormat}) AS createDt,
COALESCE(SUM(success_num), 0) AS success,
@ -65,7 +65,7 @@
GROUP BY createDt
</select>
<select id="toJobTask"
<select id="selectJobTask"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$JobTask">
SELECT COALESCE(SUM(success_num), 0) AS successNum,
COALESCE(SUM(stop_num), 0) AS stopNum,
@ -76,7 +76,7 @@
${ew.customSqlSegment}
</select>
<select id="dashboardRank"
<select id="selectDashboardRankList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
SELECT
<if test="systemTaskType == 3">

12
snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetrySummaryMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetrySummaryMapper">
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
INSERT INTO sj_retry_summary (namespace_id, group_name, scene_name, trigger_at,
running_num, finish_num, max_count_num, suspend_num)
VALUES
@ -20,7 +20,7 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
UPDATE sj_retry_summary AS rt
SET running_num = tt.running_num,
finish_num = tt.finish_num,
@ -45,7 +45,7 @@
AND rt.scene_name = tt.scene_name
</update>
<select id="retryTask"
<select id="selectRetryTask"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$RetryTask">
SELECT COALESCE(sum(running_num), 0) AS runningNum,
COALESCE(sum(finish_num), 0) AS finishNum,
@ -56,7 +56,7 @@
${ew.customSqlSegment}
</select>
<select id="retryTaskBarList"
<select id="selectRetryTaskBarList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$RetryTask">
SELECT trigger_at,
running_num,
@ -68,7 +68,7 @@
LIMIT 7
</select>
<select id="retryLineList"
<select id="selectRetryLineList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardLineResponseDO">
SELECT TO_CHAR(create_dt, #{dateFormat}) AS createDt,
COALESCE(SUM(finish_num), 0) AS successNum,
@ -81,7 +81,7 @@
GROUP BY createDt
</select>
<select id="dashboardRank"
<select id="selectDashboardRankList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
SELECT CONCAT(group_name, '/', scene_name) AS name,
SUM(running_num + finish_num + max_count_num + suspend_num) AS total

2
snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskLogMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_retry_task_log (unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name,
args_str, ext_attrs, task_type, create_dt, namespace_id)
VALUES

4
snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskLogMessageMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMessageMapper">
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_retry_task_log_message (namespace_id, group_name, unique_id, log_num, message,
create_dt, real_time)
VALUES
@ -19,7 +19,7 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
UPDATE sj_retry_task_log_message rt,
(
<foreach collection="list" item="item" index="index" separator="UNION ALL">

2
snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_retry_task (namespace_id, unique_id, group_name, scene_name,
idempotent_id, biz_no, executor_name, args_str, ext_attrs,
next_trigger_at, task_type, retry_status, create_dt)

4
snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/ServerNodeMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.ServerNodeMapper">
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
INSERT INTO sj_server_node (namespace_id, group_name, host_id, host_ip, host_port,
expire_at, node_type, ext_attrs, create_dt)
VALUES
@ -21,7 +21,7 @@
</foreach>
</insert>
<update id="batchUpdateExpireAt" parameterType="java.util.List">
<update id="updateBatchExpireAt" parameterType="java.util.List">
UPDATE sj_server_node AS rt
SET expire_at = tt.expire_at
FROM (

2
snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobLogMessageMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.JobLogMessageMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
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

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

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.JobSummaryMapper">
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
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 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
UPDATE sj_job_summary
SET success_num = src.success_num,
fail_num = src.fail_num,
@ -50,7 +50,7 @@
) AS src ON (dest.trigger_at = src.trigger_at AND dest.business_id = src.business_id)
</update>
<select id="jobLineList"
<select id="selectJobLineList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardLineResponseDO">
SELECT createDt AS createDt,
ISNULL(SUM(success_num), 0) AS success,
@ -70,7 +70,7 @@
GROUP BY createDt
</select>
<select id="toJobTask"
<select id="selectJobTask"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$JobTask">
SELECT ISNULL(SUM(success_num), 0) AS successNum,
ISNULL(SUM(stop_num), 0) AS stopNum,
@ -81,7 +81,7 @@
${ew.customSqlSegment}
</select>
<select id="dashboardRank"
<select id="selectDashboardRankList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
SELECT TOP 10
<if test="systemTaskType == 3">

12
snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetrySummaryMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetrySummaryMapper">
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
INSERT INTO sj_retry_summary (namespace_id, group_name, scene_name, trigger_at,
running_num, finish_num, max_count_num, suspend_num)
VALUES
@ -20,7 +20,7 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
UPDATE sj_retry_summary
SET running_num = src.running_num,
finish_num = src.finish_num,
@ -45,7 +45,7 @@
AND dest.namespace_id = src.namespace_id)
</update>
<select id="retryTask"
<select id="selectRetryTask"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$RetryTask">
SELECT ISNULL(SUM(running_num), 0) AS runningNum,
ISNULL(SUM(finish_num), 0) AS finishNum,
@ -56,7 +56,7 @@
${ew.customSqlSegment}
</select>
<select id="retryTaskBarList"
<select id="selectRetryTaskBarList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO$RetryTask">
SELECT TOP 7
trigger_at,
@ -68,7 +68,7 @@
${ew.customSqlSegment}
</select>
<select id="retryLineList"
<select id="selectRetryLineList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardLineResponseDO">
SELECT createDt AS createDt,
ISNULL(SUM(finish_num), 0) AS successNum,
@ -88,7 +88,7 @@
GROUP BY createDt
</select>
<select id="dashboardRank"
<select id="selectDashboardRankList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Rank">
SELECT TOP 10
CONCAT(group_name, '/', scene_name) AS name,

2
snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskLogMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_retry_task_log (unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name,
args_str, ext_attrs, task_type, create_dt, namespace_id)
VALUES

4
snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskLogMessageMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMessageMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_retry_task_log_message (namespace_id, group_name, unique_id, log_num, message,
create_dt, real_time)
VALUES
@ -20,7 +20,7 @@
</foreach>
</insert>
<update id="batchUpdate" parameterType="java.util.List">
<update id="updateBatch" parameterType="java.util.List">
UPDATE sj_retry_task_log_message
SET message = src.message, log_num = src.log_num
FROM sj_retry_task_log_message AS dest

2
snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper">
<!-- 定义批量新增的 SQL 映射 -->
<insert id="batchInsert" parameterType="java.util.List">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO sj_retry_task (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, create_dt)
VALUES
<foreach collection="list" item="item" separator=",">

4
snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/ServerNodeMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.ServerNodeMapper">
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
<insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
INSERT INTO sj_server_node (namespace_id, group_name, host_id, host_ip, host_port,
expire_at, node_type, ext_attrs, create_dt)
VALUES
@ -21,7 +21,7 @@
</foreach>
</insert>
<update id="batchUpdateExpireAt" parameterType="java.util.List">
<update id="updateBatchExpireAt" parameterType="java.util.List">
UPDATE sj_server_node
SET expire_at = src.expire_at
FROM sj_server_node AS dest

4
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/register/AbstractRegister.java
View File

@ -47,9 +47,9 @@ public abstract class AbstractRegister implements Register, Lifecycle {
}
// 批量更新
if (serverNodes.size() != serverNodeMapper.batchUpdateExpireAt(serverNodes)) {
if (serverNodes.size() != serverNodeMapper.updateBatchExpireAt(serverNodes)) {
try {
serverNodeMapper.batchInsert(serverNodes);
serverNodeMapper.insertBatch(serverNodes);
} catch (DuplicateKeyException ignored) {
} catch (Exception e) {
SnailJobLog.LOCAL.error("注册节点失败", e);

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobLogActor.java
View File

@ -61,7 +61,7 @@ public class JobLogActor extends AbstractActor {
jobLogMessageList.add(jobLogMessage);
}
jobLogMessageMapper.batchInsert(jobLogMessageList);
jobLogMessageMapper.insertBatch(jobLogMessageList);
} catch (Exception e) {
log.error("保存客户端日志异常.", e);
} finally {

13
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobLogMergeSchedule.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.schedule;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.collection.CollUtil;
import com.aizuda.snailjob.common.core.enums.JobTaskBatchStatusEnum;
import com.aizuda.snailjob.common.core.util.JsonUtil;
import com.aizuda.snailjob.common.core.util.StreamUtils;
@ -26,7 +26,6 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.util.CollectionUtils;
import java.time.Duration;
import java.time.LocalDateTime;
@ -120,14 +119,14 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle {
// Waiting for merge JobTaskBatchList
List<Long> ids = StreamUtils.toList(partitionTasks, PartitionTask::getId);
if (CollectionUtils.isEmpty(ids)) {
if (CollUtil.isEmpty(ids)) {
return;
}
// Waiting for deletion JobLogMessageList
List<JobLogMessage> jobLogMessageList = jobLogMessageMapper.selectList(
new LambdaQueryWrapper<JobLogMessage>().in(JobLogMessage::getTaskBatchId, ids));
if (CollectionUtils.isEmpty(jobLogMessageList)) {
if (CollUtil.isEmpty(jobLogMessageList)) {
return;
}
@ -169,11 +168,11 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle {
protected void doInTransactionWithoutResult(final TransactionStatus status) {
// 批量删除、更新日志
if (CollectionUtil.isNotEmpty(jobLogMessageDeleteBatchIds)) {
if (CollUtil.isNotEmpty(jobLogMessageDeleteBatchIds)) {
jobLogMessageMapper.deleteBatchIds(jobLogMessageDeleteBatchIds);
}
if (CollectionUtil.isNotEmpty(jobLogMessageInsertBatchIds)) {
jobLogMessageMapper.batchInsert(jobLogMessageInsertBatchIds);
if (CollUtil.isNotEmpty(jobLogMessageInsertBatchIds)) {
jobLogMessageMapper.insertBatch(jobLogMessageInsertBatchIds);
}
}
});

6
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/JobSummarySchedule.java
View File

@ -78,7 +78,7 @@ public class JobSummarySchedule extends AbstractSchedule implements Lifecycle {
.between(JobTaskBatch::getCreateDt, todayFrom, todayTo)
.groupBy(JobTaskBatch::getNamespaceId, JobTaskBatch::getGroupName,
JobTaskBatch::getJobId, JobTaskBatch::getTaskBatchStatus, JobTaskBatch::getOperationReason);
List<JobBatchSummaryResponseDO> summaryResponseDOList = jobTaskBatchMapper.summaryJobBatchList(wrapper);
List<JobBatchSummaryResponseDO> summaryResponseDOList = jobTaskBatchMapper.selectJobBatchSummaryList(wrapper);
if (summaryResponseDOList == null || summaryResponseDOList.size() < 1) {
continue;
}
@ -107,12 +107,12 @@ public class JobSummarySchedule extends AbstractSchedule implements Lifecycle {
int updateTotalJobSummary = 0;
if (!CollectionUtils.isEmpty(waitUpdates)) {
updateTotalJobSummary = jobSummaryMapper.batchUpdate(waitUpdates);
updateTotalJobSummary = jobSummaryMapper.updateBatch(waitUpdates);
}
int insertTotalJobSummary = 0;
if (!CollectionUtils.isEmpty(waitInserts)) {
insertTotalJobSummary = jobSummaryMapper.batchInsert(waitInserts);
insertTotalJobSummary = jobSummaryMapper.insertBatch(waitInserts);
}
SnailJobLog.LOCAL.debug(

14
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/schedule/WorkflowJobSummarySchedule.java
View File

@ -1,5 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.schedule;
import cn.hutool.core.collection.CollUtil;
import com.aizuda.snailjob.common.core.enums.JobTaskBatchStatusEnum;
import com.aizuda.snailjob.common.core.util.JsonUtil;
import com.aizuda.snailjob.common.core.util.StreamUtils;
@ -20,7 +21,6 @@ import com.google.common.collect.Lists;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.time.Duration;
import java.time.LocalDate;
@ -75,9 +75,9 @@ public class WorkflowJobSummarySchedule extends AbstractSchedule implements Life
.groupBy(WorkflowTaskBatch::getNamespaceId, WorkflowTaskBatch::getGroupName,
WorkflowTaskBatch::getWorkflowId, WorkflowTaskBatch::getTaskBatchStatus,
WorkflowTaskBatch::getOperationReason);
List<JobBatchSummaryResponseDO> summaryWorkflowResponseDOList = jobTaskBatchMapper.summaryWorkflowTaskBatchList(
List<JobBatchSummaryResponseDO> summaryWorkflowResponseDOList = jobTaskBatchMapper.selectWorkflowTaskBatchSummaryList(
wrapper);
if (CollectionUtils.isEmpty(summaryWorkflowResponseDOList)) {
if (CollUtil.isEmpty(summaryWorkflowResponseDOList)) {
continue;
}
@ -104,13 +104,13 @@ public class WorkflowJobSummarySchedule extends AbstractSchedule implements Life
}
int updateTotalJobSummary = 0;
if (!CollectionUtils.isEmpty(waitUpdates)) {
updateTotalJobSummary = jobSummaryMapper.batchUpdate(waitUpdates);
if (CollUtil.isNotEmpty(waitUpdates)) {
updateTotalJobSummary = jobSummaryMapper.updateBatch(waitUpdates);
}
int insertTotalJobSummary = 0;
if (!CollectionUtils.isEmpty(waitInserts)) {
insertTotalJobSummary = jobSummaryMapper.batchInsert(waitInserts);
if (CollUtil.isNotEmpty(waitInserts)) {
insertTotalJobSummary = jobSummaryMapper.insertBatch(waitInserts);
}
SnailJobLog.LOCAL.debug(

27
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/generator/task/AbstractGenerator.java
View File

@ -1,23 +1,25 @@
package com.aizuda.snailjob.server.retry.task.generator.task;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.Pair;
import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.common.core.enums.RetryStatusEnum;
import com.aizuda.snailjob.common.core.enums.StatusEnum;
import com.aizuda.snailjob.common.log.SnailJobLog;
import com.aizuda.snailjob.common.core.util.JsonUtil;
import com.aizuda.snailjob.common.core.util.StreamUtils;
import com.aizuda.snailjob.common.log.SnailJobLog;
import com.aizuda.snailjob.server.common.WaitStrategy;
import com.aizuda.snailjob.server.common.enums.DelayLevelEnum;
import com.aizuda.snailjob.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.snailjob.server.common.exception.SnailJobServerException;
import com.aizuda.snailjob.server.common.generator.id.IdGenerator;
import com.aizuda.snailjob.server.common.util.DateUtils;
import com.aizuda.snailjob.server.retry.task.support.RetryTaskConverter;
import com.aizuda.snailjob.server.retry.task.support.RetryTaskLogConverter;
import com.aizuda.snailjob.server.common.WaitStrategy;
import com.aizuda.snailjob.server.common.strategy.WaitStrategies;
import com.aizuda.snailjob.server.common.strategy.WaitStrategies.WaitStrategyContext;
import com.aizuda.snailjob.server.common.strategy.WaitStrategies.WaitStrategyEnum;
import com.aizuda.snailjob.server.common.util.DateUtils;
import com.aizuda.snailjob.server.retry.task.support.RetryTaskConverter;
import com.aizuda.snailjob.server.retry.task.support.RetryTaskLogConverter;
import com.aizuda.snailjob.template.datasource.access.AccessTemplate;
import com.aizuda.snailjob.template.datasource.access.TaskAccess;
import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMapper;
@ -29,7 +31,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
import java.util.*;
@ -62,8 +63,7 @@ public abstract class AbstractGenerator implements TaskGenerator {
Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TaskContext.TaskInfo::getIdempotentId))),
ArrayList::new));
Set<String> idempotentIdSet = taskInfos.stream().map(TaskContext.TaskInfo::getIdempotentId)
.collect(Collectors.toSet());
Set<String> idempotentIdSet = StreamUtils.toSet(taskInfos, TaskContext.TaskInfo::getIdempotentId);
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();
@ -77,8 +77,7 @@ public abstract class AbstractGenerator implements TaskGenerator {
.eq(RetryTask::getTaskType, SyetemTaskTypeEnum.RETRY.getType())
.in(RetryTask::getIdempotentId, idempotentIdSet));
Map<String/*幂等ID*/, List<RetryTask>> retryTaskMap = retryTasks.stream()
.collect(Collectors.groupingBy(RetryTask::getIdempotentId));
Map<String/*幂等ID*/, List<RetryTask>> retryTaskMap = StreamUtils.groupByKey(retryTasks, RetryTask::getIdempotentId);
List<RetryTask> waitInsertTasks = new ArrayList<>();
List<RetryTaskLog> waitInsertTaskLogs = new ArrayList<>();
@ -90,15 +89,15 @@ public abstract class AbstractGenerator implements TaskGenerator {
waitInsertTaskLogs.addAll(pair.getValue());
}
if (CollectionUtils.isEmpty(waitInsertTasks)) {
if (CollUtil.isEmpty(waitInsertTasks)) {
return;
}
Assert.isTrue(
waitInsertTasks.size() == retryTaskAccess.batchInsert(taskContext.getGroupName(),
waitInsertTasks.size() == retryTaskAccess.insertBatch(taskContext.getGroupName(),
taskContext.getNamespaceId(), waitInsertTasks),
() -> new SnailJobServerException("failed to report data"));
Assert.isTrue(waitInsertTaskLogs.size() == retryTaskLogMapper.batchInsert(waitInsertTaskLogs),
Assert.isTrue(waitInsertTaskLogs.size() == retryTaskLogMapper.insertBatch(waitInsertTaskLogs),
() -> new SnailJobServerException("新增重试日志失败"));
}
@ -121,7 +120,7 @@ public abstract class AbstractGenerator implements TaskGenerator {
&& taskContext.getNamespaceId().equals(retryTask.getNamespaceId())
&& taskContext.getSceneName().equals(retryTask.getSceneName())).collect(Collectors.toList());
// 说明存在相同的任务
if (!CollectionUtils.isEmpty(list)) {
if (CollUtil.isNotEmpty(list)) {
SnailJobLog.LOCAL.warn("interrupted reporting in retrying task. [{}]", JsonUtil.toJsonString(taskInfo));
return Pair.of(waitInsertTasks, waitInsertTaskLogs);
}

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/service/impl/RetryServiceImpl.java
View File

@ -146,7 +146,7 @@ public class RetryServiceImpl implements RetryService {
retryDeadLetter.setCreateDt(now);
}
Assert.isTrue(retryDeadLetters.size() == accessTemplate
.getRetryDeadLetterAccess().batchInsert(groupName, namespaceId, retryDeadLetters),
.getRetryDeadLetterAccess().insertBatch(groupName, namespaceId, retryDeadLetters),
() -> new SnailJobServerException("插入死信队列失败 [{}]", JsonUtil.toJsonString(retryDeadLetters)));
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/actor/log/RetryLogActor.java
View File

@ -73,7 +73,7 @@ public class RetryLogActor extends AbstractActor {
retryTaskLogMessages.add(retryTaskLogMessage);
}
retryTaskLogMessageMapper.batchInsert(retryTaskLogMessages);
retryTaskLogMessageMapper.insertBatch(retryTaskLogMessages);
}
/**

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryLogMergeSchedule.java
View File

@ -181,7 +181,7 @@ public class RetryLogMergeSchedule extends AbstractSchedule implements Lifecycle
retryTaskLogMessageMapper.deleteBatchIds(jobLogMessageDeleteBatchIds);
}
if (CollectionUtil.isNotEmpty(jobLogMessageUpdateList)) {
retryTaskLogMessageMapper.batchInsert(jobLogMessageUpdateList);
retryTaskLogMessageMapper.insertBatch(jobLogMessageUpdateList);
}
}
});

6
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetrySummarySchedule.java
View File

@ -69,7 +69,7 @@ public class RetrySummarySchedule extends AbstractSchedule implements Lifecycle
LambdaQueryWrapper<RetryTaskLog> wrapper = new LambdaQueryWrapper<RetryTaskLog>()
.between(RetryTaskLog::getCreateDt, todayFrom, todayTo)
.groupBy(RetryTaskLog::getNamespaceId, RetryTaskLog::getGroupName, RetryTaskLog::getSceneName);
List<DashboardRetryResponseDO> dashboardRetryResponseDOList = retryTaskLogMapper.retrySummaryRetryTaskLogList(wrapper);
List<DashboardRetryResponseDO> dashboardRetryResponseDOList = retryTaskLogMapper.selectRetryRetryTaskLogSummaryList(wrapper);
if (CollectionUtils.isEmpty(dashboardRetryResponseDOList)) {
continue;
}
@ -109,12 +109,12 @@ public class RetrySummarySchedule extends AbstractSchedule implements Lifecycle
int insertTotalRetrySummary = 0;
if (!CollectionUtils.isEmpty(waitInserts)) {
insertTotalRetrySummary = retrySummaryMapper.batchInsert(waitInserts);
insertTotalRetrySummary = retrySummaryMapper.insertBatch(waitInserts);
}
int updateTotalRetrySummary = 0;
if (!CollectionUtils.isEmpty(waitUpdates)) {
updateTotalRetrySummary = retrySummaryMapper.batchUpdate(waitUpdates);
updateTotalRetrySummary = retrySummaryMapper.updateBatch(waitUpdates);
}
SnailJobLog.LOCAL.debug("retry summary dashboard success todayFrom:[{}] todayTo:[{}] insertTotalRetrySummary:[{}] updateTotalRetrySummary:[{}]", todayFrom, todayTo, insertTotalRetrySummary, updateTotalRetrySummary);

30
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/DashBoardServiceImpl.java
View File

@ -28,7 +28,6 @@ import com.aizuda.snailjob.server.web.model.response.ServerNodeResponseVO;
import com.aizuda.snailjob.server.web.service.DashBoardService;
import com.aizuda.snailjob.server.web.service.convert.*;
import com.aizuda.snailjob.server.web.util.UserSessionUtils;
import com.aizuda.snailjob.template.datasource.enums.DbTypeEnum;
import com.aizuda.snailjob.template.datasource.persistence.dataobject.ActivePodQuantityResponseDO;
import com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardCardResponseDO;
import com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardLineResponseDO;
@ -37,7 +36,6 @@ import com.aizuda.snailjob.template.datasource.persistence.mapper.JobSummaryMapp
import com.aizuda.snailjob.template.datasource.persistence.mapper.RetrySummaryMapper;
import com.aizuda.snailjob.template.datasource.persistence.mapper.ServerNodeMapper;
import com.aizuda.snailjob.template.datasource.persistence.po.*;
import com.aizuda.snailjob.template.datasource.utils.DbUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@ -85,7 +83,7 @@ public class DashBoardServiceImpl implements DashBoardService {
DashboardCardResponseVO responseVO = new DashboardCardResponseVO();
// 重试任务
DashboardCardResponseDO.RetryTask retryTaskDO = retrySummaryMapper.retryTask(
DashboardCardResponseDO.RetryTask retryTaskDO = retrySummaryMapper.selectRetryTask(
new LambdaQueryWrapper<RetrySummary>()
.eq(RetrySummary::getNamespaceId, namespaceId)
.in(CollUtil.isNotEmpty(groupNames), RetrySummary::getGroupName, groupNames));
@ -93,7 +91,7 @@ public class DashBoardServiceImpl implements DashBoardService {
responseVO.setRetryTask(retryTaskVO);
// 定时任务
DashboardCardResponseDO.JobTask jobTaskDO = jobSummaryMapper.toJobTask(
DashboardCardResponseDO.JobTask jobTaskDO = jobSummaryMapper.selectJobTask(
new LambdaQueryWrapper<JobSummary>()
.eq(JobSummary::getSystemTaskType, SyetemTaskTypeEnum.JOB.getType())
.eq(JobSummary::getNamespaceId, namespaceId)
@ -102,7 +100,7 @@ public class DashBoardServiceImpl implements DashBoardService {
responseVO.setJobTask(jobTaskVO);
// 工作流任务
DashboardCardResponseDO.JobTask workFlowTaskDO = jobSummaryMapper.toJobTask(
DashboardCardResponseDO.JobTask workFlowTaskDO = jobSummaryMapper.selectJobTask(
new LambdaQueryWrapper<JobSummary>()
.eq(JobSummary::getSystemTaskType, SyetemTaskTypeEnum.WORKFLOW.getType())
.eq(JobSummary::getNamespaceId, namespaceId)
@ -116,7 +114,7 @@ public class DashBoardServiceImpl implements DashBoardService {
DashboardCardResponseVO.RetryTaskBar retryTaskBar = new DashboardCardResponseVO.RetryTaskBar().setX(LocalDateTime.of(LocalDate.now(), LocalTime.MIN).plusDays(-i).toLocalDate().toString()).setTaskTotal(0L);
retryTaskBarMap.put(LocalDateTimeUtil.beginOfDay(LocalDateTime.now().minusDays(i)), retryTaskBar);
}
List<DashboardCardResponseDO.RetryTask> retryTaskList = retrySummaryMapper.retryTaskBarList(
List<DashboardCardResponseDO.RetryTask> retryTaskList = retrySummaryMapper.selectRetryTaskBarList(
new LambdaQueryWrapper<RetrySummary>()
.eq(RetrySummary::getNamespaceId, namespaceId)
.in(CollUtil.isNotEmpty(groupNames), RetrySummary::getGroupName, groupNames)
@ -133,7 +131,7 @@ public class DashBoardServiceImpl implements DashBoardService {
responseVO.setRetryTaskBarList(new ArrayList<>(retryTaskBarMap.values()));
// 在线Pods
List<ActivePodQuantityResponseDO> activePodQuantityDO = serverNodeMapper.countActivePod(
List<ActivePodQuantityResponseDO> activePodQuantityDO = serverNodeMapper.selectActivePodCount(
new LambdaQueryWrapper<ServerNode>()
.in(ServerNode::getNamespaceId, Lists.newArrayList(userSessionVO.getNamespaceId(), ServerRegister.NAMESPACE_ID))
.groupBy(ServerNode::getNodeType));
@ -168,9 +166,9 @@ public class DashBoardServiceImpl implements DashBoardService {
// 针对 Group By 分页自定义countStatement
pager.setSearchCount(false);
pager.setTotal(retrySummaryMapper.retryTaskListCount(wrapper));
pager.setTotal(retrySummaryMapper.selectRetryTaskListCount(wrapper));
IPage<DashboardRetryLineResponseDO.Task> page = retrySummaryMapper.retryTaskList(wrapper, pager);
IPage<DashboardRetryLineResponseDO.Task> page = retrySummaryMapper.selectRetryTaskList(wrapper, pager);
List<DashboardRetryLineResponseVO.Task> taskList = JobSummaryResponseVOConverter.INSTANCE.convertList(page.getRecords());
PageResult<List<Task>> pageResult = new PageResult<>(
new PageDTO(pager.getCurrent(), pager.getSize(), pager.getTotal()),
@ -187,7 +185,7 @@ public class DashBoardServiceImpl implements DashBoardService {
StrUtil.isNotBlank(endTime) ?
LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) :
LocalDateTime.now());
List<DashboardLineResponseDO> dashboardRetryLinkeResponseDOList = retrySummaryMapper.retryLineList(
List<DashboardLineResponseDO> dashboardRetryLinkeResponseDOList = retrySummaryMapper.selectRetryLineList(
DashboardLineEnum.dateFormat(type),
new LambdaQueryWrapper<RetrySummary>()
.in(CollUtil.isNotEmpty(groupNames), RetrySummary::getGroupName, groupNames)
@ -200,7 +198,7 @@ public class DashBoardServiceImpl implements DashBoardService {
responseVO.setDashboardLineResponseDOList(dashboardLineResponseVOList);
// 排行榜
List<DashboardRetryLineResponseDO.Rank> rankList = retrySummaryMapper.dashboardRank(
List<DashboardRetryLineResponseDO.Rank> rankList = retrySummaryMapper.selectDashboardRankList(
new LambdaQueryWrapper<RetrySummary>()
.in(CollUtil.isNotEmpty(groupNames), RetrySummary::getGroupName, groupNames)
.eq(StrUtil.isNotBlank(groupName), RetrySummary::getGroupName, groupNames)
@ -237,11 +235,11 @@ public class DashBoardServiceImpl implements DashBoardService {
// 针对 Group By 分页自定义countStatement
pager.setSearchCount(false);
pager.setTotal(SystemModeEnum.JOB.name().equals(mode) ?
jobSummaryMapper.jobTaskListCount(wrapper):
jobSummaryMapper.workflowTaskListCount(wrapper));
jobSummaryMapper.selectJobTaskListCount(wrapper):
jobSummaryMapper.selectWorkflowTaskListCount(wrapper));
IPage<DashboardRetryLineResponseDO.Task> taskIPage = SystemModeEnum.JOB.name().equals(mode) ?
jobSummaryMapper.jobTaskList(wrapper, pager) : jobSummaryMapper.workflowTaskList(wrapper, pager);
jobSummaryMapper.selectJobTaskList(wrapper, pager) : jobSummaryMapper.selectWorkflowTaskList(wrapper, pager);
List<DashboardRetryLineResponseVO.Task> taskList = JobSummaryResponseVOConverter.INSTANCE.convertList(taskIPage.getRecords());
PageResult<List<DashboardRetryLineResponseVO.Task>> pageResult = new PageResult<>(
new PageDTO(pager.getCurrent(), pager.getSize(), pager.getTotal()),
@ -258,7 +256,7 @@ public class DashBoardServiceImpl implements DashBoardService {
StrUtil.isNotBlank(endTime) ?
LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) :
LocalDateTime.now());
List<DashboardLineResponseDO> dashboardLineResponseDOList = jobSummaryMapper.jobLineList(
List<DashboardLineResponseDO> dashboardLineResponseDOList = jobSummaryMapper.selectJobLineList(
DashboardLineEnum.dateFormat(type),
new LambdaQueryWrapper<JobSummary>()
.in(CollUtil.isNotEmpty(groupNames), JobSummary::getGroupName, groupNames)
@ -272,7 +270,7 @@ public class DashBoardServiceImpl implements DashBoardService {
responseVO.setDashboardLineResponseDOList(dashboardLineResponseVOList);
// 排行榜
List<DashboardRetryLineResponseDO.Rank> rankList = jobSummaryMapper.dashboardRank(
List<DashboardRetryLineResponseDO.Rank> rankList = jobSummaryMapper.selectDashboardRankList(
systemTaskType,
new LambdaQueryWrapper<JobSummary>()
.in(CollUtil.isNotEmpty(groupNames), JobSummary::getGroupName, groupNames)

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryDeadLetterServiceImpl.java
View File

@ -131,7 +131,7 @@ public class RetryDeadLetterServiceImpl implements RetryDeadLetterService {
}
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();
Assert.isTrue(waitRollbackList.size() == retryTaskAccess.batchInsert(groupName, namespaceId, waitRollbackList),
Assert.isTrue(waitRollbackList.size() == retryTaskAccess.insertBatch(groupName, namespaceId, waitRollbackList),
() -> new SnailJobServerException("新增重试任务失败"));
Set<Long> waitDelRetryDeadLetterIdSet = StreamUtils.toSet(retryDeadLetterList, RetryDeadLetter::getId);