From 63c9e77c61eba35958b9e6378d676f5807d1c5b2 Mon Sep 17 00:00:00 2001 From: Srzou Date: Sat, 12 Apr 2025 11:27:45 +0800 Subject: [PATCH] =?UTF-8?q?feat(1.5.0-beta1):=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=80=9A=E8=BF=87=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=90=8D=E7=A7=B0=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9B=E7=A7=BB=E9=99=A4=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=8F=8A=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E9=80=9A=E8=BF=87=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../snailjob/server/web/model/request/JobBatchQueryVO.java | 1 - .../server/web/model/request/WorkflowBatchQueryVO.java | 1 - .../snailjob/server/web/service/impl/JobBatchServiceImpl.java | 1 - .../snailjob/server/web/service/impl/JobServiceImpl.java | 4 ++-- .../server/web/service/impl/WorkflowBatchServiceImpl.java | 1 - .../snailjob/server/web/service/impl/WorkflowServiceImpl.java | 2 +- 6 files changed, 3 insertions(+), 7 deletions(-) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobBatchQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobBatchQueryVO.java index 067bb5f6d..78abd6fc4 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobBatchQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobBatchQueryVO.java @@ -15,7 +15,6 @@ import java.util.List; @Data public class JobBatchQueryVO extends BaseQueryVO { private Long jobId; - private String jobName; private List taskBatchStatus; private String groupName; } 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 45123c935..8067cce84 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 @@ -13,7 +13,6 @@ import lombok.EqualsAndHashCode; @Data public class WorkflowBatchQueryVO extends BaseQueryVO { private String groupName; - private String workflowName; private Long workflowId; private Integer taskBatchStatus; } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobBatchServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobBatchServiceImpl.java index b9a57d252..3c81eea71 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobBatchServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobBatchServiceImpl.java @@ -66,7 +66,6 @@ public class JobBatchServiceImpl implements JobBatchService { .eq(queryVO.getJobId() != null, "batch.job_id", queryVO.getJobId()) .in(CollUtil.isNotEmpty(groupNames), "batch.group_name", groupNames) .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()), "batch.create_dt", queryVO.getStartDt(), queryVO.getEndDt()) .eq("batch.deleted", 0) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java index 00d28f1e7..992a13e82 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java @@ -94,7 +94,7 @@ public class JobServiceImpl implements JobService { new LambdaQueryWrapper() .eq(Job::getNamespaceId, userSessionVO.getNamespaceId()) .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())) .eq(Objects.nonNull(queryVO.getJobStatus()), Job::getJobStatus, queryVO.getJobStatus()) .eq(Job::getDeleted, StatusEnum.NO.getStatus()) @@ -132,7 +132,7 @@ public class JobServiceImpl implements JobService { new LambdaQueryWrapper() .select(Job::getId, Job::getJobName) .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(Objects.nonNull(jobId), Job::getId, jobId) .eq(Job::getDeleted, StatusEnum.NO.getStatus()) 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 bebd38f3c..cf8513645 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 @@ -85,7 +85,6 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService { .eq(queryVO.getWorkflowId() != null, "batch.workflow_id", queryVO.getWorkflowId()) .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.isNotNull(queryVO.getDatetimeRange()), "batch.create_dt", queryVO.getStartDt(), queryVO.getEndDt()) .eq("batch.deleted", 0) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java index 77bbfe2ca..b8480b6be 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java @@ -289,7 +289,7 @@ public class WorkflowServiceImpl implements WorkflowService { new PageDTO<>(1, 100), new LambdaQueryWrapper() .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(StrUtil.isNotBlank(groupName), Workflow::getGroupName, groupName) .eq(Workflow::getDeleted, StatusEnum.NO.getStatus())