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

feat: 3.2.0

Browse Source 
1. 修复sqlserver 查询异常问题
This commit is contained in:
byteblogs168 2024-04-04 20:16:21 +08:00
parent 8a132932b5
commit 445cf77314
8 changed files with 79 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/RetryEndPoint.java
View File

@ -103,7 +103,13 @@ public class RetryEndPoint {
executeRespDto.setStatusCode(RetryResultStatusEnum.STOP.getStatus()); executeRespDto.setStatusCode(RetryResultStatusEnum.STOP.getStatus());
executeRespDto.setExceptionMsg("下游标记不需要重试"); executeRespDto.setExceptionMsg("下游标记不需要重试");
} else { } else {
executeRespDto.setStatusCode(retryerResultContext.getRetryResultStatusEnum().getStatus()); RetryResultStatusEnum retryResultStatusEnum = retryerResultContext.getRetryResultStatusEnum();
if (Objects.isNull(retryResultStatusEnum)) {
retryResultStatusEnum = RetryResultStatusEnum.STOP;
retryerResultContext.setMessage("未获取重试状态. 任务停止");
}
executeRespDto.setStatusCode(retryResultStatusEnum.getStatus());
executeRespDto.setExceptionMsg(retryerResultContext.getMessage()); executeRespDto.setExceptionMsg(retryerResultContext.getMessage());
} }

2
easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java
View File

@ -34,4 +34,6 @@ public interface JobSummaryMapper extends BaseMapper<JobSummary> {
List<DashboardRetryLineResponseDO.Rank> dashboardRank( @Param("systemTaskType") Integer systemTaskType, @Param("ew") Wrapper<JobSummary> wrapper); List<DashboardRetryLineResponseDO.Rank> dashboardRank( @Param("systemTaskType") Integer systemTaskType, @Param("ew") Wrapper<JobSummary> wrapper);
DashboardCardResponseDO.JobTask toJobTask(@Param("ew") Wrapper<JobSummary> wrapper); DashboardCardResponseDO.JobTask toJobTask(@Param("ew") Wrapper<JobSummary> wrapper);
long countJobTask(@Param("ew") Wrapper<Job> wrapper);
} }

2
easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java
View File

@ -37,4 +37,6 @@ public interface RetrySummaryMapper extends BaseMapper<RetrySummary> {
List<DashboardLineResponseDO> retryLineList(@Param("dateFormat") String dateFormat, @Param("ew") Wrapper<RetrySummary> wrapper); List<DashboardLineResponseDO> retryLineList(@Param("dateFormat") String dateFormat, @Param("ew") Wrapper<RetrySummary> wrapper);
List<DashboardRetryLineResponseDO.Rank> dashboardRank(@Param("ew") Wrapper<RetrySummary> wrapper); List<DashboardRetryLineResponseDO.Rank> dashboardRank(@Param("ew") Wrapper<RetrySummary> wrapper);
long countRetryTask(@Param("ew") Wrapper<SceneConfig> wrapper);
} }

3
easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml
View File

@ -134,8 +134,7 @@
<!-- 用于 jobTaskList 分页的 COUNT, <!-- 用于 jobTaskList 分页的 COUNT,
SQL Server SELECT COUNT(*) FROM (... ORDER BY ) 会报错 --> SQL Server SELECT COUNT(*) FROM (... ORDER BY ) 会报错 -->
<select id="sqlServer_jobTaskList_Count" <select id="countJobTask" resultType="long">
resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Task">
SELECT COUNT(DISTINCT group_name) SELECT COUNT(DISTINCT group_name)
FROM job FROM job
${ew.customSqlSegment} ${ew.customSqlSegment}

67
easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetrySummaryMapper.xml
View File

@ -16,52 +16,47 @@
</resultMap> </resultMap>
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id"> <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
INSERT INTO job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type, INSERT INTO
success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) retry_summary (namespace_id, group_name, scene_name, trigger_at, running_num, finish_num, max_count_num,
suspend_num)
VALUES VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
( (
#{item.namespaceId}, #{item.namespaceId},
#{item.groupName}, #{item.groupName},
#{item.businessId}, #{item.sceneName},
#{item.triggerAt}, #{item.triggerAt},
#{item.systemTaskType}, #{item.runningNum},
#{item.successNum}, #{item.finishNum},
#{item.failNum}, #{item.maxCountNum},
#{item.failReason}, #{item.suspendNum}
#{item.stopNum},
#{item.stopReason},
#{item.cancelNum},
#{item.cancelReason}
) )
</foreach> </foreach>
</insert> </insert>
<update id="batchUpdate" parameterType="java.util.List"> <update id="batchUpdate" parameterType="java.util.List">
UPDATE job_summary UPDATE retry_summary
SET success_num = src.success_num, SET running_num = src.running_num,
fail_num = src.fail_num, finish_num = src.finish_num,
fail_reason = src.fail_reason, max_count_num = src.max_count_num,
stop_num = src.stop_num, suspend_num = src.suspend_num
stop_reason = src.stop_reason, FROM retry_summary AS dest
cancel_num = src.cancel_num, JOIN (
cancel_reason = src.cancel_reason <foreach collection="list" item="item" index="index" separator="UNION ALL">
FROM job_summary AS dest SELECT
JOIN ( #{item.runningNum} AS running_num,
<foreach collection="list" item="item" index="index" separator="UNION ALL"> #{item.finishNum} AS finish_num,
SELECT #{item.maxCountNum} AS max_count_num,
#{item.successNum} AS success_num, #{item.suspendNum} AS suspend_num,
#{item.failNum} AS fail_num, #{item.triggerAt} AS trigger_at,
#{item.failReason} AS fail_reason, #{item.sceneName} AS scene_name,
#{item.stopNum} AS stop_num, #{item.namespaceId} AS namespace_id,
#{item.stopReason} AS stop_reason, #{item.groupName} AS group_name
#{item.cancelNum} AS cancel_num, </foreach>
#{item.cancelReason} AS cancel_reason, ) AS src
#{item.triggerAt} AS trigger_at, ON (dest.trigger_at = src.trigger_at AND dest.group_name = src.group_name
#{item.businessId} AS business_id AND dest.scene_name = src.scene_name AND dest.namespace_id = src.namespace_id
</foreach> )
) AS src
ON (dest.trigger_at = src.trigger_at AND dest.business_id = src.business_id)
</update> </update>
<select id="retryTask" <select id="retryTask"
@ -136,7 +131,7 @@
<!-- 用于 retryTaskList 分页的 自定义 COUNT, <!-- 用于 retryTaskList 分页的 自定义 COUNT,
SQL Server SELECT COUNT(*) FROM (... ORDER BY group_name) 会报错 --> SQL Server SELECT COUNT(*) FROM (... ORDER BY group_name) 会报错 -->
<select id="sqlServer_jobTaskList_Count" resultType="java.lang.Integer"> <select id="countRetryTask" resultType="long">
SELECT COUNT(DISTINCT group_name) SELECT COUNT(DISTINCT group_name)
FROM scene_config FROM scene_config
${ew.customSqlSegment} ${ew.customSqlSegment}

20
easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskMapper.xml
View File

@ -49,16 +49,16 @@
</insert> </insert>
<update id="updateBatchNextTriggerAtById" parameterType="java.util.List"> <update id="updateBatchNextTriggerAtById" parameterType="java.util.List">
UPDATE target UPDATE retry_task_${partition}
SET target.next_trigger_at = src.next_trigger_at SET next_trigger_at = src.next_trigger_at
FROM retry_task_${partition} as target FROM retry_task_${partition} as target
JOIN ( JOIN (
<foreach collection="list" item="item" index="index" separator="UNION ALL"> <foreach collection="list" item="item" index="index" separator="UNION ALL">
SELECT SELECT
#{item.nextTriggerAt} AS next_trigger_at, #{item.nextTriggerAt} AS next_trigger_at,
#{item.id} AS id #{item.id} AS id
</foreach> </foreach>
) AS src ) AS src
ON target.id = src.id; ON target.id = src.id;
</update> </update>
</mapper> </mapper>

16
easy-retry-datasource/easy-retry-sqlserver-datasource/src/main/resources/sqlserver/mapper/WorkflowMapper.xml
View File

@ -18,14 +18,14 @@
<update id="updateBatchNextTriggerAtById" parameterType="java.util.List"> <update id="updateBatchNextTriggerAtById" parameterType="java.util.List">
UPDATE workflow UPDATE workflow
SET workflow.next_trigger_at = src.next_trigger_at SET next_trigger_at = src.next_trigger_at
FROM workflow FROM workflow dest
JOIN ( JOIN (
<foreach collection="list" item="item" index="index" separator="UNION ALL"> <foreach collection="list" item="item" index="index" separator="UNION ALL">
SELECT SELECT
#{item.nextTriggerAt} AS next_trigger_at, #{item.nextTriggerAt} AS next_trigger_at,
#{item.id} AS id #{item.id} AS id
</foreach> </foreach>
) AS src ON workflow.id = src.id; ) AS src ON dest.id = src.id;
</update> </update>
</mapper> </mapper>

32
easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java
View File

@ -147,16 +147,18 @@ public class DashBoardServiceImpl implements DashBoardService {
DashboardRetryLineResponseVO dashboardRetryLineResponseVO = new DashboardRetryLineResponseVO(); DashboardRetryLineResponseVO dashboardRetryLineResponseVO = new DashboardRetryLineResponseVO();
// 重试任务列表 // 重试任务列表
Page<Object> pager = new Page<>(baseQueryVO.getPage(), baseQueryVO.getSize()); Page<Object> pager = new Page<>(baseQueryVO.getPage(), baseQueryVO.getSize());
// 针对SQL Server的分页COUNT, 自定义statement ID
if (DbTypeEnum.SQLSERVER == DbUtils.getDbType()) {
pager.setCountId("sqlServer_jobTaskList_Count");
}
LambdaQueryWrapper<SceneConfig> wrapper = new LambdaQueryWrapper<SceneConfig>() LambdaQueryWrapper<SceneConfig> wrapper = new LambdaQueryWrapper<SceneConfig>()
.eq(SceneConfig::getNamespaceId, namespaceId) .eq(SceneConfig::getNamespaceId, namespaceId)
.in(CollUtil.isNotEmpty(groupNames), SceneConfig::getGroupName, groupNames); .in(CollUtil.isNotEmpty(groupNames), SceneConfig::getGroupName, groupNames);
IPage<DashboardRetryLineResponseDO.Task> IPage = retrySummaryMapper.retryTaskList(wrapper, pager); // 针对SQL Server的分页COUNT, 自定义statement ID
List<DashboardRetryLineResponseVO.Task> taskList = JobSummaryResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVO(IPage.getRecords()); if (DbTypeEnum.SQLSERVER == DbUtils.getDbType()) {
PageResult<List<DashboardRetryLineResponseVO.Task>> pageResult = new PageResult<>(new PageDTO(IPage.getCurrent(), IPage.getSize(), IPage.getTotal()), taskList); pager.setSearchCount(false);
pager.setTotal(retrySummaryMapper.countRetryTask(wrapper));
}
IPage<DashboardRetryLineResponseDO.Task> page = retrySummaryMapper.retryTaskList(wrapper, pager);
List<DashboardRetryLineResponseVO.Task> taskList = JobSummaryResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVO(page.getRecords());
PageResult<List<DashboardRetryLineResponseVO.Task>> pageResult = new PageResult<>(new PageDTO(pager.getCurrent(), pager.getSize(), pager.getTotal()), taskList);
dashboardRetryLineResponseVO.setTaskList(pageResult); dashboardRetryLineResponseVO.setTaskList(pageResult);
// 折线图 // 折线图
@ -198,18 +200,20 @@ public class DashBoardServiceImpl implements DashBoardService {
DashboardRetryLineResponseVO dashboardRetryLineResponseVO = new DashboardRetryLineResponseVO(); DashboardRetryLineResponseVO dashboardRetryLineResponseVO = new DashboardRetryLineResponseVO();
// 重试任务列表 // 重试任务列表
Page<Object> pager = new Page<>(baseQueryVO.getPage(), baseQueryVO.getSize()); Page<Object> pager = new Page<>(baseQueryVO.getPage(), baseQueryVO.getSize());
// 针对SQL Server的分页COUNT, 自定义statement ID
if (DbTypeEnum.SQLSERVER == DbUtils.getDbType()) {
pager.setCountId("sqlServer_jobTaskList_Count");
}
// 任务类型 // 任务类型
Integer systemTaskType = SystemModeEnum.JOB.name().equals(mode) ? SyetemTaskTypeEnum.JOB.getType() : SyetemTaskTypeEnum.WORKFLOW.getType(); Integer systemTaskType = SystemModeEnum.JOB.name().equals(mode) ? SyetemTaskTypeEnum.JOB.getType() : SyetemTaskTypeEnum.WORKFLOW.getType();
LambdaQueryWrapper<Job> wrapper1 = new LambdaQueryWrapper<Job>() LambdaQueryWrapper<Job> wrapper1 = new LambdaQueryWrapper<Job>()
.eq(Job::getNamespaceId, namespaceId) .eq(Job::getNamespaceId, namespaceId)
.in(CollUtil.isNotEmpty(groupNames), Job::getGroupName, groupNames); .in(CollUtil.isNotEmpty(groupNames), Job::getGroupName, groupNames);
IPage<DashboardRetryLineResponseDO.Task> IPage = jobSummaryMapper.jobTaskList(wrapper1, pager); // 针对SQL Server的分页COUNT, 自定义statement ID
List<DashboardRetryLineResponseVO.Task> taskList = JobSummaryResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVO(IPage.getRecords()); if (DbTypeEnum.SQLSERVER == DbUtils.getDbType()) {
PageResult<List<DashboardRetryLineResponseVO.Task>> pageResult = new PageResult<>(new PageDTO(IPage.getCurrent(), IPage.getSize(), IPage.getTotal()), taskList); pager.setSearchCount(false);
pager.setTotal(jobSummaryMapper.countJobTask(wrapper1));
}
IPage<DashboardRetryLineResponseDO.Task> page = jobSummaryMapper.jobTaskList(wrapper1, pager);
List<DashboardRetryLineResponseVO.Task> taskList = JobSummaryResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVO(page.getRecords());
PageResult<List<DashboardRetryLineResponseVO.Task>> pageResult = new PageResult<>(new PageDTO(pager.getCurrent(), pager.getSize(), pager.getTotal()), taskList);
dashboardRetryLineResponseVO.setTaskList(pageResult); dashboardRetryLineResponseVO.setTaskList(pageResult);
// 折线图 // 折线图