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

feat(1.5.0-beta1): 支持定时任务通过任务名称模糊查询；移除定时任务批次及工作流批次通过名称查询

Browse Source
This commit is contained in:
Srzou 2025-04-12 11:27:45 +08:00 committed by opensnail
parent 0ad2cbd162
commit f0997ffa2f
6 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,6 @@ import java.util.List;
@Data @Data
public class JobBatchQueryVO extends BaseQueryVO { public class JobBatchQueryVO extends BaseQueryVO {
private Long jobId; private Long jobId;
private String jobName;
private List<Integer> taskBatchStatus; private List<Integer> taskBatchStatus;
private String groupName; private String groupName;
} }

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

@ -13,7 +13,6 @@ import lombok.EqualsAndHashCode;
@Data @Data
public class WorkflowBatchQueryVO extends BaseQueryVO { public class WorkflowBatchQueryVO extends BaseQueryVO {
private String groupName; private String groupName;
private String workflowName;
private Long workflowId; private Long workflowId;
private Integer taskBatchStatus; private Integer taskBatchStatus;
} }

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

@ -66,7 +66,6 @@ public class JobBatchServiceImpl implements JobBatchService {
.eq(queryVO.getJobId() != null, "batch.job_id", queryVO.getJobId()) .eq(queryVO.getJobId() != null, "batch.job_id", queryVO.getJobId())
.in(CollUtil.isNotEmpty(groupNames), "batch.group_name", groupNames) .in(CollUtil.isNotEmpty(groupNames), "batch.group_name", groupNames)
.in(ObjUtil.isNotEmpty(queryVO.getTaskBatchStatus()), "batch.task_batch_status", queryVO.getTaskBatchStatus()) .in(ObjUtil.isNotEmpty(queryVO.getTaskBatchStatus()), "batch.task_batch_status", queryVO.getTaskBatchStatus())
.likeRight(StrUtil.isNotBlank(queryVO.getJobName()), "job.job_name", queryVO.getJobName())
.between(ObjUtil.isAllNotEmpty(queryVO.getStartDt(), queryVO.getEndDt()), .between(ObjUtil.isAllNotEmpty(queryVO.getStartDt(), queryVO.getEndDt()),
"batch.create_dt", queryVO.getStartDt(), queryVO.getEndDt()) "batch.create_dt", queryVO.getStartDt(), queryVO.getEndDt())
.eq("batch.deleted", 0) .eq("batch.deleted", 0)

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

@ -94,7 +94,7 @@ public class JobServiceImpl implements JobService {
new LambdaQueryWrapper<Job>() new LambdaQueryWrapper<Job>()
.eq(Job::getNamespaceId, userSessionVO.getNamespaceId()) .eq(Job::getNamespaceId, userSessionVO.getNamespaceId())
.in(CollUtil.isNotEmpty(groupNames), Job::getGroupName, groupNames) .in(CollUtil.isNotEmpty(groupNames), Job::getGroupName, groupNames)
.likeRight(StrUtil.isNotBlank(queryVO.getJobName()), Job::getJobName, StrUtil.trim(queryVO.getJobName())) .like(StrUtil.isNotBlank(queryVO.getJobName()), Job::getJobName, StrUtil.trim(queryVO.getJobName()))
.like(StrUtil.isNotBlank(queryVO.getExecutorInfo()), Job::getExecutorInfo, StrUtil.trim(queryVO.getExecutorInfo())) .like(StrUtil.isNotBlank(queryVO.getExecutorInfo()), Job::getExecutorInfo, StrUtil.trim(queryVO.getExecutorInfo()))
.eq(Objects.nonNull(queryVO.getJobStatus()), Job::getJobStatus, queryVO.getJobStatus()) .eq(Objects.nonNull(queryVO.getJobStatus()), Job::getJobStatus, queryVO.getJobStatus())
.eq(Job::getDeleted, StatusEnum.NO.getStatus()) .eq(Job::getDeleted, StatusEnum.NO.getStatus())
@ -132,7 +132,7 @@ public class JobServiceImpl implements JobService {
new LambdaQueryWrapper<Job>() new LambdaQueryWrapper<Job>()
.select(Job::getId, Job::getJobName) .select(Job::getId, Job::getJobName)
.eq(Job::getNamespaceId, userSessionVO.getNamespaceId()) .eq(Job::getNamespaceId, userSessionVO.getNamespaceId())
.likeRight(StrUtil.isNotBlank(keywords), Job::getJobName, StrUtil.trim(keywords)) .like(StrUtil.isNotBlank(keywords), Job::getJobName, StrUtil.trim(keywords))
.eq(StrUtil.isNotBlank(groupName), Job::getGroupName, groupName) .eq(StrUtil.isNotBlank(groupName), Job::getGroupName, groupName)
.eq(Objects.nonNull(jobId), Job::getId, jobId) .eq(Objects.nonNull(jobId), Job::getId, jobId)
.eq(Job::getDeleted, StatusEnum.NO.getStatus()) .eq(Job::getDeleted, StatusEnum.NO.getStatus())

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

@ -85,7 +85,6 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService {
.eq(queryVO.getWorkflowId() != null, "batch.workflow_id", queryVO.getWorkflowId()) .eq(queryVO.getWorkflowId() != null, "batch.workflow_id", queryVO.getWorkflowId())
.in(CollUtil.isNotEmpty(groupNames), "batch.group_name", groupNames) .in(CollUtil.isNotEmpty(groupNames), "batch.group_name", groupNames)
.eq(queryVO.getTaskBatchStatus() != null, "batch.task_batch_status", queryVO.getTaskBatchStatus()) .eq(queryVO.getTaskBatchStatus() != null, "batch.task_batch_status", queryVO.getTaskBatchStatus())
.likeRight(StrUtil.isNotBlank(queryVO.getWorkflowName()), "flow.workflow_name", queryVO.getWorkflowName())
.between(ObjUtil.isNotNull(queryVO.getDatetimeRange()), .between(ObjUtil.isNotNull(queryVO.getDatetimeRange()),
"batch.create_dt", queryVO.getStartDt(), queryVO.getEndDt()) "batch.create_dt", queryVO.getStartDt(), queryVO.getEndDt())
.eq("batch.deleted", 0) .eq("batch.deleted", 0)

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

@ -289,7 +289,7 @@ public class WorkflowServiceImpl implements WorkflowService {
new PageDTO<>(1, 100), new PageDTO<>(1, 100),
new LambdaQueryWrapper<Workflow>() new LambdaQueryWrapper<Workflow>()
.select(Workflow::getId, Workflow::getWorkflowName) .select(Workflow::getId, Workflow::getWorkflowName)
.likeRight(StrUtil.isNotBlank(keywords), Workflow::getWorkflowName, StrUtil.trim(keywords)) .like(StrUtil.isNotBlank(keywords), Workflow::getWorkflowName, StrUtil.trim(keywords))
.eq(Objects.nonNull(workflowId), Workflow::getId, workflowId) .eq(Objects.nonNull(workflowId), Workflow::getId, workflowId)
.eq(StrUtil.isNotBlank(groupName), Workflow::getGroupName, groupName) .eq(StrUtil.isNotBlank(groupName), Workflow::getGroupName, groupName)
.eq(Workflow::getDeleted, StatusEnum.NO.getStatus()) .eq(Workflow::getDeleted, StatusEnum.NO.getStatus())