diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobBatchResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobBatchResponseVOConverter.java index ad9b6973b..54a05a7a5 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobBatchResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobBatchResponseVOConverter.java @@ -31,7 +31,7 @@ public interface JobBatchResponseVOConverter { }) JobBatchResponseVO convert(JobBatchResponseDO jobBatchResponseDO); - List convertListToJobBatchResponseList(List jobTaskBatchList); + List convertListToJobBatchList(List jobTaskBatchList); @Mappings({ @Mapping(target = "executionAt", expression = "java(JobBatchResponseVOConverter.toLocalDateTime(jobTaskBatch.getExecutionAt()))") diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyRecipientConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyRecipientConverter.java index 2f8d130ca..cb33b6c47 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyRecipientConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyRecipientConverter.java @@ -25,7 +25,7 @@ public interface NotifyRecipientConverter { NotifyRecipient convert(NotifyRecipientRequestVO requestVO); - List convertListToCommonLabelValueResponseList(List notifyRecipients); + List convertListToCommonLabelValueList(List notifyRecipients); @Mappings({ @Mapping(target = "label", source = "recipientName"), diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/WorkflowConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/WorkflowConverter.java index cf0a18c22..11df1dd73 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/WorkflowConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/WorkflowConverter.java @@ -48,14 +48,14 @@ public interface WorkflowConverter { }) WorkflowDetailResponseVO.NodeInfo convert(WorkflowNode workflowNode); - List convertListToWorkflowResponseList(List workflowList); + List convertListToWorkflowList(List workflowList); @Mappings({ @Mapping(target = "nextTriggerAt", expression = "java(WorkflowConverter.toLocalDateTime(workflow.getNextTriggerAt()))") }) - WorkflowResponseVO convertToWorkflowResponseVO(Workflow workflow); + WorkflowResponseVO convertToWorkflow(Workflow workflow); - List convertListToWorkflowBatchResponseList(List workflowBatchResponseList); + List convertListToWorkflowBatchList(List workflowBatchResponseList); @Mappings({ @Mapping(source = "workflowTaskBatch.groupName", target = "groupName"), diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyRecipientServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyRecipientServiceImpl.java index 58d0469b4..44ba1d214 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyRecipientServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyRecipientServiceImpl.java @@ -65,7 +65,7 @@ public class NotifyRecipientServiceImpl implements NotifyRecipientService { List notifyRecipients = notifyRecipientMapper.selectList( new LambdaQueryWrapper() .select(NotifyRecipient::getRecipientName, NotifyRecipient::getId)); - return NotifyRecipientConverter.INSTANCE.convertListToCommonLabelValueResponseList(notifyRecipients); + return NotifyRecipientConverter.INSTANCE.convertListToCommonLabelValueList(notifyRecipients); } @Override 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 2d2ea960d..ea3f730ee 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 @@ -83,7 +83,7 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService { List batchResponseDOList = workflowTaskBatchMapper.selectWorkflowBatchPageList(pageDTO, wrapper); List batchResponseVOList = - WorkflowConverter.INSTANCE.convertListToWorkflowBatchResponseList(batchResponseDOList); + WorkflowConverter.INSTANCE.convertListToWorkflowBatchList(batchResponseDOList); return new PageResult<>(pageDTO, batchResponseVOList); } @@ -138,7 +138,7 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService { jobTaskBatchList = jobTaskBatchList.stream() .sorted(Comparator.comparingInt(JobTaskBatch::getTaskBatchStatus)) .collect(Collectors.toList()); - nodeInfo.setJobBatchList(JobBatchResponseVOConverter.INSTANCE.convertListToJobBatchResponseList(jobTaskBatchList)); + nodeInfo.setJobBatchList(JobBatchResponseVOConverter.INSTANCE.convertListToJobBatchList(jobTaskBatchList)); // 取第最新的一条状态 JobTaskBatch jobTaskBatch = jobTaskBatchList.get(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 3b2c18bea..d82b2b81b 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 @@ -215,7 +215,7 @@ public class WorkflowServiceImpl implements WorkflowService { .eq(Objects.nonNull(queryVO.getWorkflowStatus()), Workflow::getWorkflowStatus, queryVO.getWorkflowStatus()) .orderByDesc(Workflow::getId)); - List jobResponseList = WorkflowConverter.INSTANCE.convertListToWorkflowResponseList(page.getRecords()); + List jobResponseList = WorkflowConverter.INSTANCE.convertListToWorkflowList(page.getRecords()); return new PageResult<>(pageDTO, jobResponseList); } @@ -320,7 +320,7 @@ public class WorkflowServiceImpl implements WorkflowService { .eq(Workflow::getDeleted, StatusEnum.NO.getStatus()) .orderByAsc(Workflow::getId)); - return WorkflowConverter.INSTANCE.convertListToWorkflowResponseList(selectPage.getRecords()); + return WorkflowConverter.INSTANCE.convertListToWorkflowList(selectPage.getRecords()); } @Override