feat(1.4.0-beta1): 1.重试任务添加重试id
This commit is contained in:
parent
3a6566c532
commit
9a144c28a7
@ -22,7 +22,7 @@ import java.util.Set;
|
|||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/retry-task")
|
@RequestMapping("/retry-task")
|
||||||
public class RetryTaskLogController {
|
public class RetryTaskController {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private RetryTaskLogService retryTaskLogService;
|
private RetryTaskLogService retryTaskLogService;
|
@ -19,6 +19,7 @@ import com.aizuda.snailjob.server.web.service.convert.RetryTaskLogResponseVOConv
|
|||||||
import com.aizuda.snailjob.server.web.util.UserSessionUtils;
|
import com.aizuda.snailjob.server.web.util.UserSessionUtils;
|
||||||
import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper;
|
import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper;
|
||||||
import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMessageMapper;
|
import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMessageMapper;
|
||||||
|
import com.aizuda.snailjob.template.datasource.persistence.po.Retry;
|
||||||
import com.aizuda.snailjob.template.datasource.persistence.po.RetryTask;
|
import com.aizuda.snailjob.template.datasource.persistence.po.RetryTask;
|
||||||
import com.aizuda.snailjob.template.datasource.persistence.po.RetryTaskLogMessage;
|
import com.aizuda.snailjob.template.datasource.persistence.po.RetryTaskLogMessage;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
@ -60,7 +61,7 @@ public class RetryTaskLogServiceImpl implements RetryTaskLogService {
|
|||||||
.between(ObjUtil.isNotNull(queryVO.getDatetimeRange()),
|
.between(ObjUtil.isNotNull(queryVO.getDatetimeRange()),
|
||||||
RetryTask::getCreateDt, queryVO.getStartDt(), queryVO.getEndDt())
|
RetryTask::getCreateDt, queryVO.getStartDt(), queryVO.getEndDt())
|
||||||
.select(RetryTask::getGroupName, RetryTask::getId, RetryTask::getSceneName, RetryTask::getTaskStatus,
|
.select(RetryTask::getGroupName, RetryTask::getId, RetryTask::getSceneName, RetryTask::getTaskStatus,
|
||||||
RetryTask::getCreateDt, RetryTask::getTaskType, RetryTask::getOperationReason)
|
RetryTask::getCreateDt, RetryTask::getTaskType, RetryTask::getOperationReason, RetryTask::getRetryId)
|
||||||
.orderByDesc(RetryTask::getCreateDt);
|
.orderByDesc(RetryTask::getCreateDt);
|
||||||
|
|
||||||
PageDTO<RetryTask> retryTaskPageDTO = retryTaskMapper.selectPage(pageDTO, wrapper);
|
PageDTO<RetryTask> retryTaskPageDTO = retryTaskMapper.selectPage(pageDTO, wrapper);
|
||||||
|
@ -99,7 +99,7 @@ public class RetryTaskServiceImpl implements RetryTaskService {
|
|||||||
.eq(Retry::getTaskType, SyetemTaskTypeEnum.RETRY.getType())
|
.eq(Retry::getTaskType, SyetemTaskTypeEnum.RETRY.getType())
|
||||||
.select(Retry::getId, Retry::getBizNo, Retry::getIdempotentId,
|
.select(Retry::getId, Retry::getBizNo, Retry::getIdempotentId,
|
||||||
Retry::getGroupName, Retry::getNextTriggerAt, Retry::getRetryCount,
|
Retry::getGroupName, Retry::getNextTriggerAt, Retry::getRetryCount,
|
||||||
Retry::getRetryStatus, Retry::getUpdateDt, Retry::getSceneName,
|
Retry::getRetryStatus, Retry::getUpdateDt, Retry::getCreateDt, Retry::getSceneName,
|
||||||
Retry::getTaskType, Retry::getParentId)
|
Retry::getTaskType, Retry::getParentId)
|
||||||
.orderByDesc(Retry::getCreateDt);
|
.orderByDesc(Retry::getCreateDt);
|
||||||
pageDTO = accessTemplate.getRetryAccess().listPage(pageDTO, queryWrapper);
|
pageDTO = accessTemplate.getRetryAccess().listPage(pageDTO, queryWrapper);
|
||||||
|
Loading…
Reference in New Issue
Block a user