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

feat(1.4.0-beta1): 1. 修复重试任务批量删除失败问题

Browse Source
This commit is contained in:
opensnail 2025-02-23 19:47:10 +08:00
parent abe08bed5c
commit c32d1c5426
6 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/sql/snail_job_mysql.sql
View File

@ -150,7 +150,7 @@ CREATE TABLE `sj_retry_task`
`task_status` tinyint(4) NOT NULL DEFAULT 1 COMMENT '重试状态',
`task_type` tinyint(4) NOT NULL DEFAULT 1 COMMENT '任务类型 1、重试数据 2、回调数据',
`operation_reason` tinyint(4) NOT NULL DEFAULT 0 COMMENT '操作原因',
`client_info` varchar(128) DEFAULT NULL COMMENT '客户端地址 clientId#ip:port',
`client_info` varchar(128) DEFAULT NULL COMMENT '客户端地址 clientId#ip:port',
`create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
PRIMARY KEY (`id`),

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/RetryController.java
View File

@ -41,7 +41,7 @@ public class RetryController {
@LoginRequired
@PutMapping("status")
public int updateRetryTaskStatus(@RequestBody RetryUpdateStatusRequestVO retryUpdateStatusRequestVO) {
return retryService.updateRetryTaskStatus(retryUpdateStatusRequestVO);
return retryService.updateRetryStatus(retryUpdateStatusRequestVO);
}
@LoginRequired

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetrySaveRequestVO.java
View File

@ -1,8 +1,8 @@
package com.aizuda.snailjob.server.web.model.request;
import com.aizuda.snailjob.common.core.enums.RetryStatusEnum;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import org.hibernate.validator.constraints.NotBlank;
/**
* 重试数据模型

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

@ -30,7 +30,7 @@ public interface RetryService {
* @param retryUpdateStatusRequestVO 更新重试任务状态请求模型
* @return
*/
int updateRetryTaskStatus(RetryUpdateStatusRequestVO retryUpdateStatusRequestVO);
int updateRetryStatus(RetryUpdateStatusRequestVO retryUpdateStatusRequestVO);
/**
* 手动新增重试任务

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

@ -54,8 +54,10 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionTemplate;
import java.time.LocalDateTime;
import java.util.*;
@ -83,6 +85,8 @@ public class RetryServiceImpl implements RetryService {
private List<TaskGenerator> taskGenerators;
@Autowired
private RetryTaskLogMessageMapper retryTaskLogMessageMapper;
@Autowired
private TransactionTemplate transactionTemplate;
@Override
public PageResult<List<RetryResponseVO>> getRetryPage(RetryQueryVO queryVO) {
@ -141,7 +145,7 @@ public class RetryServiceImpl implements RetryService {
@Override
@Transactional
public int updateRetryTaskStatus(RetryUpdateStatusRequestVO requestVO) {
public int updateRetryStatus(RetryUpdateStatusRequestVO requestVO) {
RetryStatusEnum retryStatusEnum = RetryStatusEnum.getByStatus(requestVO.getRetryStatus());
if (Objects.isNull(retryStatusEnum)) {
@ -178,13 +182,6 @@ public class RetryServiceImpl implements RetryService {
retryLogMetaDTO.setTimestamp(DateUtils.toNowMilli());
SnailJobLog.REMOTE.info("=============手动操作完成============. <|>{}<|>", retryLogMetaDTO);
}
//
// RetryTask retryTask = new RetryTask();
// retryTask.setTaskStatus(requestVO.getRetryStatus());
// retryTaskMapper.update(retryTask, new LambdaUpdateWrapper<RetryTask>()
// .eq(RetryTask::getNamespaceId, namespaceId)
// .eq(RetryTask::getUniqueId, retry.getUniqueId())
// .eq(RetryTask::getGroupName, retry.getGroupName()));
retry.setUpdateDt(LocalDateTime.now());
return retryTaskAccess.updateById(retry);
@ -351,16 +348,25 @@ public class RetryServiceImpl implements RetryService {
String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId();
map.forEach(((sceneName, retryTaskDTOS) -> {
TaskContext taskContext = new TaskContext();
taskContext.setSceneName(sceneName);
taskContext.setGroupName(parseLogsVO.getGroupName());
taskContext.setNamespaceId(namespaceId);
taskContext.setInitStatus(parseLogsVO.getRetryStatus());
taskContext.setTaskInfos(TaskContextConverter.INSTANCE.convert(retryTaskDTOS));
transactionTemplate.execute((status -> {
map.forEach(((sceneName, retryTaskDTOS) -> {
TaskContext taskContext = new TaskContext();
taskContext.setSceneName(sceneName);
taskContext.setGroupName(parseLogsVO.getGroupName());
taskContext.setNamespaceId(namespaceId);
taskContext.setInitStatus(parseLogsVO.getRetryStatus());
taskContext.setTaskInfos(TaskContextConverter.INSTANCE.convert(retryTaskDTOS));
// 生成任务
taskGenerator.taskGenerator(taskContext);
// 生成任务
try {
taskGenerator.taskGenerator(taskContext);
} catch (DuplicateKeyException e) {
throw new SnailJobServerException("namespaceId:[{}] groupName:[{}] sceneName:[{}] 任务已经存在",
namespaceId, parseLogsVO.getGroupName(), sceneName);
}
}));
return Boolean.TRUE;
}));
return waitInsertList.size();

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

@ -197,7 +197,7 @@ public class RetryTaskServiceImpl implements RetryTaskService {
List<RetryTask> retryTasks = retryTaskMapper.selectList(
new LambdaQueryWrapper<RetryTask>()
.in(RetryTask::getTaskStatus, List.of(RetryStatusEnum.FINISH.getStatus(), RetryStatusEnum.MAX_COUNT.getStatus()))
.in(RetryTask::getTaskStatus, RetryTaskStatusEnum.TERMINAL_STATUS_SET)
.eq(RetryTask::getNamespaceId, namespaceId)
.in(RetryTask::getId, ids));
Assert.notEmpty(retryTasks, () -> new SnailJobServerException("数据不存在"));
@ -216,8 +216,11 @@ public class RetryTaskServiceImpl implements RetryTaskService {
@Override
public Boolean stopById(Long id) {
Retry retry = retryMapper.selectById(id);
Assert.notNull(retry, () -> new SnailJobServerException("没有可执行的任务"));
RetryTask retryTask = retryTaskMapper.selectById(id);
Assert.notNull(retryTask, () -> new SnailJobServerException("没有可执行的任务"));
Retry retry = retryMapper.selectById(retryTask.getRetryId());
Assert.notNull(retry, () -> new SnailJobServerException("任务不存在"));
TaskStopJobDTO taskStopJobDTO = RetryConverter.INSTANCE.toTaskStopJobDTO(retry);
taskStopJobDTO.setOperationReason(RetryOperationReasonEnum.MANNER_STOP.getReason());