From 5d24bf4838ffeba63cc7c8c2dd2cd02247e448bc Mon Sep 17 00:00:00 2001 From: dhb52 Date: Sun, 16 Jun 2024 21:54:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=E6=89=B9=E6=AC=A1=E3=80=81=E9=87=8D=E8=AF=95=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E3=80=81=E9=87=8D=E8=AF=95=E6=97=A5=E5=BF=97=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/model/request/RetryDeadLetterQueryVO.java | 4 ++++ .../web/model/request/RetryTaskLogQueryVO.java | 6 ++++++ .../web/model/request/WorkflowBatchQueryVO.java | 4 ++++ .../service/impl/RetryDeadLetterServiceImpl.java | 3 +++ .../web/service/impl/RetryTaskLogServiceImpl.java | 3 +++ .../web/service/impl/WorkflowBatchServiceImpl.java | 13 ++++++++----- 6 files changed, 28 insertions(+), 5 deletions(-) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryDeadLetterQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryDeadLetterQueryVO.java index 3305581e..b4034215 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryDeadLetterQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryDeadLetterQueryVO.java @@ -3,6 +3,8 @@ package com.aizuda.snailjob.server.web.model.request; import com.aizuda.snailjob.server.web.model.base.BaseQueryVO; import lombok.Data; +import java.time.LocalDateTime; + /** * @author: opensnail * @date : 2022-02-28 09:45 @@ -14,4 +16,6 @@ public class RetryDeadLetterQueryVO extends BaseQueryVO { private String bizNo; private String idempotentId; private String uniqueId; + private LocalDateTime beginDate; + private LocalDateTime endDate; } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskLogQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskLogQueryVO.java index dd7dee8a..ee297464 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskLogQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskLogQueryVO.java @@ -3,6 +3,8 @@ package com.aizuda.snailjob.server.web.model.request; import com.aizuda.snailjob.server.web.model.base.BaseQueryVO; import lombok.Data; +import java.time.LocalDateTime; + /** * @author: opensnail * @date : 2022-02-28 09:08 @@ -21,4 +23,8 @@ public class RetryTaskLogQueryVO extends BaseQueryVO { private String uniqueId; private Integer retryStatus; + + private LocalDateTime beginDate; + + private LocalDateTime endDate; } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/WorkflowBatchQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/WorkflowBatchQueryVO.java index 468ac0b4..00c66157 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/WorkflowBatchQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/WorkflowBatchQueryVO.java @@ -4,6 +4,8 @@ import com.aizuda.snailjob.server.web.model.base.BaseQueryVO; import lombok.Data; import lombok.EqualsAndHashCode; +import java.time.LocalDateTime; + /** * @author xiaowoniu * @date 2023-12-23 17:49:59 @@ -16,4 +18,6 @@ public class WorkflowBatchQueryVO extends BaseQueryVO { private String workflowName; private Long workflowId; private Integer taskBatchStatus; + private LocalDateTime beginDate; + private LocalDateTime endDate; } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryDeadLetterServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryDeadLetterServiceImpl.java index 29f27900..845a7f41 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryDeadLetterServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryDeadLetterServiceImpl.java @@ -2,6 +2,7 @@ package com.aizuda.snailjob.server.web.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.enums.RetryStatusEnum; import com.aizuda.snailjob.common.core.util.StreamUtils; @@ -73,6 +74,8 @@ public class RetryDeadLetterServiceImpl implements RetryDeadLetterService { .eq(StrUtil.isNotBlank(queryVO.getBizNo()), RetryDeadLetter::getBizNo, queryVO.getBizNo()) .eq(StrUtil.isNotBlank(queryVO.getIdempotentId()), RetryDeadLetter::getIdempotentId, queryVO.getIdempotentId()) .eq(StrUtil.isNotBlank(queryVO.getUniqueId()), RetryDeadLetter::getUniqueId, queryVO.getUniqueId()) + .between(ObjUtil.isAllNotEmpty(queryVO.getBeginDate(), queryVO.getEndDate()), + RetryDeadLetter::getCreateDt, queryVO.getBeginDate(), queryVO.getEndDate()) .orderByDesc(RetryDeadLetter::getId)); return new PageResult<>(retryDeadLetterPageDTO, diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskLogServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskLogServiceImpl.java index 611652a6..faa0cb4a 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskLogServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskLogServiceImpl.java @@ -2,6 +2,7 @@ package com.aizuda.snailjob.server.web.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.enums.RetryStatusEnum; import com.aizuda.snailjob.common.core.util.JsonUtil; @@ -58,6 +59,8 @@ public class RetryTaskLogServiceImpl implements RetryTaskLogService { .eq(StrUtil.isNotBlank(queryVO.getUniqueId()), RetryTaskLog::getUniqueId, queryVO.getUniqueId()) .eq(StrUtil.isNotBlank(queryVO.getIdempotentId()), RetryTaskLog::getIdempotentId, queryVO.getIdempotentId()) .eq(queryVO.getRetryStatus() != null, RetryTaskLog::getRetryStatus, queryVO.getRetryStatus()) + .between(ObjUtil.isAllNotEmpty(queryVO.getBeginDate(), queryVO.getEndDate()), + RetryTaskLog::getCreateDt, queryVO.getBeginDate(), queryVO.getEndDate()) .select(RetryTaskLog::getGroupName, RetryTaskLog::getId, RetryTaskLog::getSceneName, RetryTaskLog::getIdempotentId, RetryTaskLog::getBizNo, RetryTaskLog::getRetryStatus, diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java index 402de994..ac7b4584 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java @@ -2,6 +2,7 @@ package com.aizuda.snailjob.server.web.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.constant.SystemConstants; import com.aizuda.snailjob.common.core.enums.JobOperationReasonEnum; @@ -59,6 +60,11 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService { private final WorkflowBatchHandler workflowBatchHandler; private final JobMapper jobMapper; + private static boolean isNoOperation(JobTaskBatch i) { + return JobOperationReasonEnum.WORKFLOW_SUCCESSOR_SKIP_EXECUTION.contains(i.getOperationReason()) + || i.getTaskBatchStatus() == JobTaskBatchStatusEnum.STOP.getStatus(); + } + @Override public PageResult> listPage(WorkflowBatchQueryVO queryVO) { PageDTO pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize()); @@ -77,6 +83,8 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService { .in(CollUtil.isNotEmpty(groupNames), "batch.group_name", groupNames) .eq(queryVO.getTaskBatchStatus() != null, "batch.task_batch_status", queryVO.getTaskBatchStatus()) .likeRight(StrUtil.isNotBlank(queryVO.getWorkflowName()), "flow.workflow_name", queryVO.getWorkflowName()) + .between(ObjUtil.isAllNotEmpty(queryVO.getBeginDate(), queryVO.getEndDate()), + "batch.create_dt", queryVO.getBeginDate(), queryVO.getEndDate()) .eq("batch.deleted", 0) .orderByDesc("batch.id"); List batchResponseDOList = workflowTaskBatchMapper.selectWorkflowBatchPageList(pageDTO, wrapper); @@ -202,9 +210,4 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService { return Boolean.TRUE; } - private static boolean isNoOperation(JobTaskBatch i) { - return JobOperationReasonEnum.WORKFLOW_SUCCESSOR_SKIP_EXECUTION.contains(i.getOperationReason()) - || i.getTaskBatchStatus() == JobTaskBatchStatusEnum.STOP.getStatus(); - } - }