From e7cf4e109c84514031412a652b09cec1763a3a10 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Fri, 10 May 2024 12:52:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20mapstruct=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=A3=8E=E6=A0=BC:=20convert,convertList,con?= =?UTF-8?q?vertToXxx,convertListToXxxxList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DispatchQuantityResponseVOConverter.java | 2 +- .../service/convert/GroupConfigConverter.java | 2 +- .../GroupConfigResponseVOConverter.java | 4 ++-- .../convert/JobBatchResponseVOConverter.java | 10 +++++----- .../web/service/convert/JobConverter.java | 2 +- .../convert/JobNotifyConfigConverter.java | 2 +- .../JobNotifyConfigResponseVOConverter.java | 2 +- .../convert/JobResponseVOConverter.java | 4 ++-- .../JobSummaryResponseVOConverter.java | 6 +++--- .../convert/JobTaskResponseVOConverter.java | 2 +- .../convert/NamespaceResponseVOConverter.java | 2 +- .../convert/NotifyConfigConverter.java | 2 +- .../NotifyConfigResponseVOConverter.java | 2 +- .../convert/NotifyRecipientConverter.java | 8 ++++---- .../PermissionsResponseVOConverter.java | 2 +- .../RetryDeadLetterResponseVOConverter.java | 2 +- .../RetrySummaryResponseVOConverter.java | 2 +- .../RetryTaskLogResponseVOConverter.java | 2 +- .../convert/RetryTaskResponseVOConverter.java | 4 ++-- .../service/convert/SceneConfigConverter.java | 2 +- .../SceneConfigResponseVOConverter.java | 2 +- .../SceneQuantityRankResponseVOConverter.java | 2 +- .../ServerNodeResponseVOConverter.java | 2 +- .../SystemUserResponseVOConverter.java | 2 +- .../service/convert/TaskContextConverter.java | 5 ++--- .../service/convert/WorkflowConverter.java | 18 ++++++++--------- .../web/service/handler/WorkflowHandler.java | 2 +- .../service/impl/DashBoardServiceImpl.java | 20 +++++++++---------- .../service/impl/GroupConfigServiceImpl.java | 6 +++--- .../web/service/impl/JobBatchServiceImpl.java | 5 ++--- .../web/service/impl/JobServiceImpl.java | 10 +++++----- .../web/service/impl/JobTaskServiceImpl.java | 2 +- .../service/impl/NamespaceServiceImpl.java | 4 ++-- .../service/impl/NotifyConfigServiceImpl.java | 7 +++---- .../impl/NotifyRecipientServiceImpl.java | 8 ++++---- .../impl/RetryDeadLetterServiceImpl.java | 2 +- .../service/impl/RetryTaskLogServiceImpl.java | 2 +- .../service/impl/RetryTaskServiceImpl.java | 8 ++++---- .../service/impl/SceneConfigServiceImpl.java | 8 ++++---- .../service/impl/SystemUserServiceImpl.java | 6 +++--- .../impl/WorkflowBatchServiceImpl.java | 8 ++++---- .../web/service/impl/WorkflowServiceImpl.java | 12 +++++------ 42 files changed, 101 insertions(+), 104 deletions(-) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/DispatchQuantityResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/DispatchQuantityResponseVOConverter.java index d8cf20cf..365dbac1 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/DispatchQuantityResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/DispatchQuantityResponseVOConverter.java @@ -17,5 +17,5 @@ public interface DispatchQuantityResponseVOConverter { DispatchQuantityResponseVOConverter INSTANCE = Mappers.getMapper(DispatchQuantityResponseVOConverter.class); - List toDashboardLineResponseVO(List dashboardLineResponseDOList); + List convertList(List dashboardLineResponseDOList); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/GroupConfigConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/GroupConfigConverter.java index 281be89a..7a8800dc 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/GroupConfigConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/GroupConfigConverter.java @@ -20,5 +20,5 @@ public interface GroupConfigConverter { GroupConfig convert(GroupConfigRequestVO groupConfigRequestVO); - List batchConvert(List groupConfigRequestVOS); + List convertList(List groupConfigRequestVOS); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/GroupConfigResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/GroupConfigResponseVOConverter.java index 339957d6..18ac1a01 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/GroupConfigResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/GroupConfigResponseVOConverter.java @@ -17,7 +17,7 @@ public interface GroupConfigResponseVOConverter { GroupConfigResponseVOConverter INSTANCE = Mappers.getMapper(GroupConfigResponseVOConverter.class); - GroupConfigResponseVO toGroupConfigResponseVO(GroupConfig groupConfig); + GroupConfigResponseVO convert(GroupConfig groupConfig); - List toGroupConfigResponseVO(List groupConfigs); + List convertList(List groupConfigs); } 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 e4468846..ad9b6973 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 @@ -24,19 +24,19 @@ public interface JobBatchResponseVOConverter { JobBatchResponseVOConverter INSTANCE = Mappers.getMapper(JobBatchResponseVOConverter.class); - List toJobBatchResponseVOs(List jobBatches); + List convertList(List jobBatches); @Mappings({ @Mapping(target = "executionAt", expression = "java(JobBatchResponseVOConverter.toLocalDateTime(jobBatchResponseDO.getExecutionAt()))") }) - JobBatchResponseVO toJobBatchResponseVO(JobBatchResponseDO jobBatchResponseDO); + JobBatchResponseVO convert(JobBatchResponseDO jobBatchResponseDO); - List jobTaskBatchToJobBatchResponseVOs(List jobTaskBatchList); + List convertListToJobBatchResponseList(List jobTaskBatchList); @Mappings({ @Mapping(target = "executionAt", expression = "java(JobBatchResponseVOConverter.toLocalDateTime(jobTaskBatch.getExecutionAt()))") }) - JobBatchResponseVO toJobBatchResponseVO(JobTaskBatch jobTaskBatch); + JobBatchResponseVO convert(JobTaskBatch jobTaskBatch); @Mappings({ @Mapping(source = "jobBatch.groupName", target = "groupName"), @@ -44,7 +44,7 @@ public interface JobBatchResponseVOConverter { @Mapping(source = "jobBatch.createDt", target = "createDt"), @Mapping(target = "executionAt", expression = "java(JobBatchResponseVOConverter.toLocalDateTime(jobBatch.getExecutionAt()))") }) - JobBatchResponseVO toJobBatchResponseVO(JobTaskBatch jobBatch, Job job); + JobBatchResponseVO convert(JobTaskBatch jobBatch, Job job); static LocalDateTime toLocalDateTime(Long nextTriggerAt) { if (Objects.isNull(nextTriggerAt) || nextTriggerAt == 0) { diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobConverter.java index 2f52b10c..1cf9fb78 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobConverter.java @@ -15,6 +15,6 @@ public interface JobConverter { JobConverter INSTANCE = Mappers.getMapper(JobConverter.class); - Job toJob(JobRequestVO jobRequestVO); + Job convert(JobRequestVO jobRequestVO); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobNotifyConfigConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobNotifyConfigConverter.java index 1660ab02..5002a5bc 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobNotifyConfigConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobNotifyConfigConverter.java @@ -14,5 +14,5 @@ public interface JobNotifyConfigConverter { JobNotifyConfigConverter INSTANCE = Mappers.getMapper(JobNotifyConfigConverter.class); - JobNotifyConfig toJobNotifyConfig(JobNotifyConfigRequestVO jobNotifyConfigVO); + JobNotifyConfig convert(JobNotifyConfigRequestVO jobNotifyConfigVO); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobNotifyConfigResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobNotifyConfigResponseVOConverter.java index fd89f56b..610e15fa 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobNotifyConfigResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobNotifyConfigResponseVOConverter.java @@ -19,5 +19,5 @@ public interface JobNotifyConfigResponseVOConverter { JobNotifyConfigResponseVO convert(JobNotifyConfig jobNotifyConfig); - List batchConvert(List jobNotifyConfigs); + List convertList(List jobNotifyConfigs); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobResponseVOConverter.java index 2f6ef826..c044db44 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobResponseVOConverter.java @@ -25,12 +25,12 @@ public interface JobResponseVOConverter { // @Mappings({ // @Mapping(source = "nextTriggerAt", target = "nextTriggerAt", expression = "java(DateUtils.toLocalDateTime())") // }) - List toJobResponseVOs(List jobs); + List convertList(List jobs); @Mappings({ @Mapping(target = "nextTriggerAt", expression = "java(JobResponseVOConverter.toLocalDateTime(job.getNextTriggerAt()))") }) - JobResponseVO toJobResponseVO(Job job); + JobResponseVO convert(Job job); static LocalDateTime toLocalDateTime(Long nextTriggerAt) { if (Objects.isNull(nextTriggerAt) || nextTriggerAt == 0) { diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobSummaryResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobSummaryResponseVOConverter.java index 8d089dcd..e5c95a2f 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobSummaryResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobSummaryResponseVOConverter.java @@ -28,14 +28,14 @@ public interface JobSummaryResponseVOConverter { @Mappings({ @Mapping(target = "successRate", expression = "java(JobSummaryResponseVOConverter.toSuccessRate(jobTask.getSuccessNum(), jobTask.getTotalNum()))") }) - JobTask toTaskJob(DashboardCardResponseDO.JobTask jobTask); + JobTask convert(DashboardCardResponseDO.JobTask jobTask); @Mappings({ @Mapping(target = "successRate", expression = "java(JobSummaryResponseVOConverter.toSuccessRate(jobTask.getSuccessNum(), jobTask.getTotalNum()))") }) - WorkFlowTask toWorkFlowTask(DashboardCardResponseDO.JobTask jobTask); + WorkFlowTask convertToWorkFlowTask(DashboardCardResponseDO.JobTask jobTask); - List toDashboardRetryLineResponseVO(List taskList); + List convertList(List taskList); static BigDecimal toSuccessRate(Integer successNum, Integer totalNum) { if (Objects.isNull(totalNum) || totalNum == 0) { diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobTaskResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobTaskResponseVOConverter.java index 6a65f40e..280adde9 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobTaskResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobTaskResponseVOConverter.java @@ -22,5 +22,5 @@ public interface JobTaskResponseVOConverter { @Mappings( @Mapping(source = "id", target = "key") ) - List toJobTaskResponseVOs(List jobTasks); + List convertList(List jobTasks); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NamespaceResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NamespaceResponseVOConverter.java index a1db65cb..e6ed3485 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NamespaceResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NamespaceResponseVOConverter.java @@ -17,5 +17,5 @@ public interface NamespaceResponseVOConverter { NamespaceResponseVOConverter INSTANCE = Mappers.getMapper(NamespaceResponseVOConverter.class); - List toNamespaceResponseVOs(List namespaces); + List convertList(List namespaces); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyConfigConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyConfigConverter.java index 71e79a14..8124b390 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyConfigConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyConfigConverter.java @@ -31,5 +31,5 @@ public interface NotifyConfigConverter { @Mappings({ @Mapping(target = "recipientIds", expression = "java(NotifyConfigConverter.toNotifyRecipientIdsStr(notifyConfigVO.getRecipientIds()))") }) - NotifyConfig toNotifyConfig(NotifyConfigRequestVO notifyConfigVO); + NotifyConfig convert(NotifyConfigRequestVO notifyConfigVO); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyConfigResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyConfigResponseVOConverter.java index a8492ad1..5c31f9b7 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyConfigResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyConfigResponseVOConverter.java @@ -27,7 +27,7 @@ public interface NotifyConfigResponseVOConverter { }) NotifyConfigResponseVO convert(NotifyConfig notifyConfig); - List batchConvert(List notifyConfigs); + List convertList(List notifyConfigs); static Set toNotifyRecipientIds(String notifyRecipientIdsStr) { if (StrUtil.isBlank(notifyRecipientIdsStr)) { 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 6b8a38a9..2f8d130c 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 @@ -21,15 +21,15 @@ public interface NotifyRecipientConverter { NotifyRecipientConverter INSTANCE = Mappers.getMapper(NotifyRecipientConverter.class); - List toNotifyRecipientResponseVOs(List notifyRecipients); + List convertList(List notifyRecipients); - NotifyRecipient toNotifyRecipient(NotifyRecipientRequestVO requestVO); + NotifyRecipient convert(NotifyRecipientRequestVO requestVO); - List toCommonLabelValueResponseVOs(List notifyRecipients); + List convertListToCommonLabelValueResponseList(List notifyRecipients); @Mappings({ @Mapping(target = "label", source = "recipientName"), @Mapping(target = "value", source = "id") }) - CommonLabelValueResponseVO toCommonLabelValueResponseVO(NotifyRecipient notifyRecipient); + CommonLabelValueResponseVO convert(NotifyRecipient notifyRecipient); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/PermissionsResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/PermissionsResponseVOConverter.java index 85df3b2c..b4c18f58 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/PermissionsResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/PermissionsResponseVOConverter.java @@ -17,6 +17,6 @@ public interface PermissionsResponseVOConverter { PermissionsResponseVOConverter INSTANCE = Mappers.getMapper(PermissionsResponseVOConverter.class); - List toPermissionsResponseVOs(List systemUserPermissionList); + List convertList(List systemUserPermissionList); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetryDeadLetterResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetryDeadLetterResponseVOConverter.java index e05c1133..594189ea 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetryDeadLetterResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetryDeadLetterResponseVOConverter.java @@ -18,5 +18,5 @@ public interface RetryDeadLetterResponseVOConverter { RetryDeadLetterResponseVO convert(RetryDeadLetter retryDeadLetter); - List batchConvert(List retryDeadLetters); + List convertList(List retryDeadLetters); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetrySummaryResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetrySummaryResponseVOConverter.java index 1c141a07..bd2b063a 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetrySummaryResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetrySummaryResponseVOConverter.java @@ -15,5 +15,5 @@ public interface RetrySummaryResponseVOConverter { RetrySummaryResponseVOConverter INSTANCE = Mappers.getMapper(RetrySummaryResponseVOConverter.class); - RetryTask toRetryTask(DashboardCardResponseDO.RetryTask retryTask); + RetryTask convert(DashboardCardResponseDO.RetryTask retryTask); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetryTaskLogResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetryTaskLogResponseVOConverter.java index ccd83ceb..7d753445 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetryTaskLogResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetryTaskLogResponseVOConverter.java @@ -18,6 +18,6 @@ public interface RetryTaskLogResponseVOConverter { RetryTaskLogResponseVO convert(RetryTaskLog retryTaskLog); - List batchConvert(List retryTaskLogs); + List convertList(List retryTaskLogs); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetryTaskResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetryTaskResponseVOConverter.java index 45ddb0ee..2d10184d 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetryTaskResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/RetryTaskResponseVOConverter.java @@ -17,7 +17,7 @@ public interface RetryTaskResponseVOConverter { RetryTaskResponseVOConverter INSTANCE = Mappers.getMapper(RetryTaskResponseVOConverter.class); - RetryTaskResponseVO toRetryTaskResponseVO(RetryTask retryTask); + RetryTaskResponseVO convert(RetryTask retryTask); - List toRetryTaskResponseVO(List retryTasks); + List convertList(List retryTasks); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigConverter.java index fe048177..d8761f4d 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigConverter.java @@ -14,6 +14,6 @@ public interface SceneConfigConverter { SceneConfigConverter INSTANCE = Mappers.getMapper(SceneConfigConverter.class); - RetrySceneConfig toSceneConfigRequestVO(SceneConfigRequestVO requestVO); + RetrySceneConfig convert(SceneConfigRequestVO requestVO); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigResponseVOConverter.java index dd213714..25eea2f0 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigResponseVOConverter.java @@ -18,5 +18,5 @@ public interface SceneConfigResponseVOConverter { SceneConfigResponseVO convert(RetrySceneConfig retrySceneConfig); - List batchConvert(List retrySceneConfigs); + List convertList(List retrySceneConfigs); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneQuantityRankResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneQuantityRankResponseVOConverter.java index b3967069..0514ceb6 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneQuantityRankResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneQuantityRankResponseVOConverter.java @@ -17,5 +17,5 @@ public interface SceneQuantityRankResponseVOConverter { SceneQuantityRankResponseVOConverter INSTANCE = Mappers.getMapper(SceneQuantityRankResponseVOConverter.class); - List toDashboardRetryLineResponseVORank(List rankList); + List convertList(List rankList); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/ServerNodeResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/ServerNodeResponseVOConverter.java index d9bb22cc..c1b9b30c 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/ServerNodeResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/ServerNodeResponseVOConverter.java @@ -17,6 +17,6 @@ public interface ServerNodeResponseVOConverter { ServerNodeResponseVOConverter INSTANCE = Mappers.getMapper(ServerNodeResponseVOConverter.class); - List toServerNodeResponseVO(List serverNodes); + List convertList(List serverNodes); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SystemUserResponseVOConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SystemUserResponseVOConverter.java index ba6ca524..36889aed 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SystemUserResponseVOConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SystemUserResponseVOConverter.java @@ -22,5 +22,5 @@ public interface SystemUserResponseVOConverter { SystemUserResponseVO convert(SystemUser systemUser); - List batchConvert(List systemUsers); + List convertList(List systemUsers); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/TaskContextConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/TaskContextConverter.java index ee946be7..4fa9712e 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/TaskContextConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/TaskContextConverter.java @@ -3,7 +3,6 @@ package com.aizuda.snailjob.server.web.service.convert; import com.aizuda.snailjob.server.model.dto.RetryTaskDTO; import com.aizuda.snailjob.server.retry.task.generator.task.TaskContext; import com.aizuda.snailjob.server.web.model.request.RetryTaskSaveRequestVO; -import com.aizuda.snailjob.server.retry.task.generator.task.TaskContext; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -18,7 +17,7 @@ import java.util.List; public interface TaskContextConverter { TaskContextConverter INSTANCE = Mappers.getMapper(TaskContextConverter.class); - TaskContext.TaskInfo toTaskContextInfo(RetryTaskSaveRequestVO retryTaskSaveRequestVO); + TaskContext.TaskInfo convert(RetryTaskSaveRequestVO retryTaskSaveRequestVO); - List toTaskContextInfo(List retryTasks); + List convert(List retryTasks); } 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 cfe79389..cf0a18c2 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 @@ -33,29 +33,29 @@ public interface WorkflowConverter { WorkflowConverter INSTANCE = Mappers.getMapper(WorkflowConverter.class); - Workflow toWorkflow(WorkflowRequestVO workflowRequestVO); + Workflow convert(WorkflowRequestVO workflowRequestVO); - WorkflowNode toWorkflowNode(WorkflowRequestVO.NodeInfo nodeInfo); + WorkflowNode convert(WorkflowRequestVO.NodeInfo nodeInfo); - WorkflowDetailResponseVO toWorkflowDetailResponseVO(Workflow workflow); + WorkflowDetailResponseVO convert(Workflow workflow); - List toNodeInfo(List workflowNodes); + List convertList(List workflowNodes); @Mappings({ @Mapping(target = "decision", expression = "java(WorkflowConverter.parseDecisionConfig(workflowNode))"), @Mapping(target = "callback", expression = "java(WorkflowConverter.parseCallbackConfig(workflowNode))"), @Mapping(target = "jobTask", expression = "java(WorkflowConverter.parseJobTaskConfig(workflowNode))") }) - WorkflowDetailResponseVO.NodeInfo toNodeInfo(WorkflowNode workflowNode); + WorkflowDetailResponseVO.NodeInfo convert(WorkflowNode workflowNode); - List toWorkflowResponseVO(List workflowList); + List convertListToWorkflowResponseList(List workflowList); @Mappings({ @Mapping(target = "nextTriggerAt", expression = "java(WorkflowConverter.toLocalDateTime(workflow.getNextTriggerAt()))") }) - WorkflowResponseVO toWorkflowResponseVO(Workflow workflow); + WorkflowResponseVO convertToWorkflowResponseVO(Workflow workflow); - List toWorkflowBatchResponseVO(List workflowBatchResponseList); + List convertListToWorkflowBatchResponseList(List workflowBatchResponseList); @Mappings({ @Mapping(source = "workflowTaskBatch.groupName", target = "groupName"), @@ -63,7 +63,7 @@ public interface WorkflowConverter { @Mapping(source = "workflowTaskBatch.createDt", target = "createDt"), @Mapping(target = "executionAt", expression = "java(WorkflowConverter.toLocalDateTime(workflowTaskBatch.getExecutionAt()))") }) - WorkflowBatchResponseVO toWorkflowBatchResponseVO(WorkflowTaskBatch workflowTaskBatch, Workflow workflow); + WorkflowBatchResponseVO convert(WorkflowTaskBatch workflowTaskBatch, Workflow workflow); static LocalDateTime toLocalDateTime(Long nextTriggerAt) { if (Objects.isNull(nextTriggerAt) || nextTriggerAt == 0) { diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/WorkflowHandler.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/WorkflowHandler.java index 686a3a7a..21322fca 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/WorkflowHandler.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/WorkflowHandler.java @@ -144,7 +144,7 @@ public class WorkflowHandler { .sorted(Comparator.comparing(WorkflowRequestVO.NodeInfo::getPriorityLevel)) .collect(Collectors.toList()); for (final WorkflowRequestVO.NodeInfo nodeInfo : conditionNodes) { - WorkflowNode workflowNode = WorkflowConverter.INSTANCE.toWorkflowNode(nodeInfo); + WorkflowNode workflowNode = WorkflowConverter.INSTANCE.convert(nodeInfo); workflowNode.setWorkflowId(workflowId); workflowNode.setGroupName(groupName); workflowNode.setNodeType(nodeConfig.getNodeType()); diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/DashBoardServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/DashBoardServiceImpl.java index 05f895c4..3cebe6f5 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/DashBoardServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/DashBoardServiceImpl.java @@ -89,7 +89,7 @@ public class DashBoardServiceImpl implements DashBoardService { new LambdaQueryWrapper() .eq(RetrySummary::getNamespaceId, namespaceId) .in(CollUtil.isNotEmpty(groupNames), RetrySummary::getGroupName, groupNames)); - DashboardCardResponseVO.RetryTask retryTaskVO = RetrySummaryResponseVOConverter.INSTANCE.toRetryTask(retryTaskDO); + DashboardCardResponseVO.RetryTask retryTaskVO = RetrySummaryResponseVOConverter.INSTANCE.convert(retryTaskDO); responseVO.setRetryTask(retryTaskVO); // 定时任务 @@ -98,7 +98,7 @@ public class DashBoardServiceImpl implements DashBoardService { .eq(JobSummary::getSystemTaskType, SyetemTaskTypeEnum.JOB.getType()) .eq(JobSummary::getNamespaceId, namespaceId) .in(CollUtil.isNotEmpty(groupNames), JobSummary::getGroupName, groupNames)); - DashboardCardResponseVO.JobTask jobTaskVO = JobSummaryResponseVOConverter.INSTANCE.toTaskJob(jobTaskDO); + DashboardCardResponseVO.JobTask jobTaskVO = JobSummaryResponseVOConverter.INSTANCE.convert(jobTaskDO); responseVO.setJobTask(jobTaskVO); // 工作流任务 @@ -107,7 +107,7 @@ public class DashBoardServiceImpl implements DashBoardService { .eq(JobSummary::getSystemTaskType, SyetemTaskTypeEnum.WORKFLOW.getType()) .eq(JobSummary::getNamespaceId, namespaceId) .in(CollUtil.isNotEmpty(groupNames), JobSummary::getGroupName, groupNames)); - DashboardCardResponseVO.WorkFlowTask workFlowTaskVO = JobSummaryResponseVOConverter.INSTANCE.toWorkFlowTask(workFlowTaskDO); + DashboardCardResponseVO.WorkFlowTask workFlowTaskVO = JobSummaryResponseVOConverter.INSTANCE.convertToWorkFlowTask(workFlowTaskDO); responseVO.setWorkFlowTask(workFlowTaskVO); // 重试任务柱状图 @@ -171,7 +171,7 @@ public class DashBoardServiceImpl implements DashBoardService { } IPage page = retrySummaryMapper.retryTaskList(wrapper, pager); - List taskList = JobSummaryResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVO(page.getRecords()); + List taskList = JobSummaryResponseVOConverter.INSTANCE.convertList(page.getRecords()); PageResult> pageResult = new PageResult<>( new PageDTO(pager.getCurrent(), pager.getSize(), pager.getTotal()), taskList); @@ -188,7 +188,7 @@ public class DashBoardServiceImpl implements DashBoardService { .eq(StrUtil.isNotBlank(groupName), RetrySummary::getGroupName, groupName) .eq(RetrySummary::getNamespaceId, namespaceId) .between(RetrySummary::getTriggerAt, startDateTime, endDateTime)); - List dashboardLineResponseVOList = DispatchQuantityResponseVOConverter.INSTANCE.toDashboardLineResponseVO(dashboardRetryLinkeResponseDOList); + List dashboardLineResponseVOList = DispatchQuantityResponseVOConverter.INSTANCE.convertList(dashboardRetryLinkeResponseDOList); dateTypeEnum.getConsumer().accept(dashboardLineResponseVOList); dashboardLineResponseVOList.sort(Comparator.comparing(a -> a.getCreateDt())); responseVO.setDashboardLineResponseDOList(dashboardLineResponseVOList); @@ -202,7 +202,7 @@ public class DashBoardServiceImpl implements DashBoardService { .ge(RetrySummary::getTriggerAt, startDateTime) .le(RetrySummary::getTriggerAt, endDateTime) .groupBy(RetrySummary::getNamespaceId, RetrySummary::getGroupName, RetrySummary::getSceneName)); - List ranks = SceneQuantityRankResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVORank(rankList); + List ranks = SceneQuantityRankResponseVOConverter.INSTANCE.convertList(rankList); responseVO.setRankList(ranks); return responseVO; } @@ -233,7 +233,7 @@ public class DashBoardServiceImpl implements DashBoardService { } IPage page = jobSummaryMapper.jobTaskList(wrapper, pager); - List taskList = JobSummaryResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVO(page.getRecords()); + List taskList = JobSummaryResponseVOConverter.INSTANCE.convertList(page.getRecords()); PageResult> pageResult = new PageResult<>( new PageDTO(pager.getCurrent(), pager.getSize(), pager.getTotal()), taskList); @@ -251,7 +251,7 @@ public class DashBoardServiceImpl implements DashBoardService { .eq(JobSummary::getSystemTaskType, systemTaskType) .eq(JobSummary::getNamespaceId, namespaceId) .between(JobSummary::getTriggerAt, startDateTime, endDateTime)); - List dashboardLineResponseVOList = DispatchQuantityResponseVOConverter.INSTANCE.toDashboardLineResponseVO(dashboardLineResponseDOList); + List dashboardLineResponseVOList = DispatchQuantityResponseVOConverter.INSTANCE.convertList(dashboardLineResponseDOList); dateTypeEnum.getConsumer().accept(dashboardLineResponseVOList); dashboardLineResponseVOList.sort(Comparator.comparing(DashboardLineResponseVO::getCreateDt)); responseVO.setDashboardLineResponseDOList(dashboardLineResponseVOList); @@ -266,7 +266,7 @@ public class DashBoardServiceImpl implements DashBoardService { .eq(JobSummary::getSystemTaskType, systemTaskType) .eq(JobSummary::getNamespaceId, namespaceId) .groupBy(JobSummary::getNamespaceId, JobSummary::getGroupName, JobSummary::getBusinessId)); - List ranks = SceneQuantityRankResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVORank(rankList); + List ranks = SceneQuantityRankResponseVOConverter.INSTANCE.convertList(rankList); responseVO.setRankList(ranks); return responseVO; } @@ -282,7 +282,7 @@ public class DashBoardServiceImpl implements DashBoardService { .ge(ServerNode::getExpireAt, LocalDateTime.now().minusSeconds(ServerRegister.DELAY_TIME + (ServerRegister.DELAY_TIME / 3))) .orderByDesc(ServerNode::getNodeType); PageDTO serverNodePageDTO = serverNodeMapper.selectPage(pageDTO, serverNodeLambdaQueryWrapper); - List responseVOList = ServerNodeResponseVOConverter.INSTANCE.toServerNodeResponseVO(serverNodePageDTO.getRecords()); + List responseVOList = ServerNodeResponseVOConverter.INSTANCE.convertList(serverNodePageDTO.getRecords()); for (final ServerNodeResponseVO serverNodeResponseVO : responseVOList) { if (NodeTypeEnum.CLIENT.getType().equals(serverNodeResponseVO.getNodeType())) { diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/GroupConfigServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/GroupConfigServiceImpl.java index bb694507..9021dda3 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/GroupConfigServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/GroupConfigServiceImpl.java @@ -189,7 +189,7 @@ public class GroupConfigServiceImpl implements GroupConfigService { PageResult> pageResult = new PageResult<>(groupConfigPageDTO.getCurrent(), groupConfigPageDTO.getSize(), groupConfigPageDTO.getTotal()); - List responseVOList = GroupConfigResponseVOConverter.INSTANCE.toGroupConfigResponseVO( + List responseVOList = GroupConfigResponseVOConverter.INSTANCE.convertList( records); for (GroupConfigResponseVO groupConfigResponseVO : responseVOList) { @@ -279,7 +279,7 @@ public class GroupConfigServiceImpl implements GroupConfigService { .eq(GroupConfig::getNamespaceId, UserSessionUtils.currentUserSession().getNamespaceId()) .eq(GroupConfig::getGroupName, groupName)); - GroupConfigResponseVO groupConfigResponseVO = GroupConfigResponseVOConverter.INSTANCE.toGroupConfigResponseVO( + GroupConfigResponseVO groupConfigResponseVO = GroupConfigResponseVOConverter.INSTANCE.convert( groupConfig); Optional.ofNullable(IdGeneratorModeEnum.modeOf(groupConfig.getIdGeneratorMode())).ifPresent(idGeneratorMode -> { @@ -308,7 +308,7 @@ public class GroupConfigServiceImpl implements GroupConfigService { Map namespaceMap = StreamUtils.toMap(namespaces, Namespace::getUniqueId, Namespace::getName); - List groupConfigResponses = GroupConfigResponseVOConverter.INSTANCE.toGroupConfigResponseVO( + List groupConfigResponses = GroupConfigResponseVOConverter.INSTANCE.convertList( groupConfigs); for (final GroupConfigResponseVO groupConfigResponseVO : groupConfigResponses) { groupConfigResponseVO.setNamespaceName(namespaceMap.get(groupConfigResponseVO.getNamespaceId())); 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 fe1b90c5..57182b46 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 @@ -24,7 +24,6 @@ import com.aizuda.snailjob.template.datasource.persistence.po.JobTaskBatch; import com.aizuda.snailjob.template.datasource.persistence.po.WorkflowNode; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -69,7 +68,7 @@ public class JobBatchServiceImpl implements JobBatchService { .eq("a.deleted", 0) .orderByDesc("a.id"); List batchResponseDOList = jobTaskBatchMapper.selectJobBatchPageList(pageDTO, wrapper); - List batchResponseVOList = JobBatchResponseVOConverter.INSTANCE.toJobBatchResponseVOs( + List batchResponseVOList = JobBatchResponseVOConverter.INSTANCE.convertList( batchResponseDOList); return new PageResult<>(pageDTO, batchResponseVOList); } @@ -82,7 +81,7 @@ public class JobBatchServiceImpl implements JobBatchService { } Job job = jobMapper.selectById(jobTaskBatch.getJobId()); - JobBatchResponseVO jobBatchResponseVO = JobBatchResponseVOConverter.INSTANCE.toJobBatchResponseVO(jobTaskBatch, job); + JobBatchResponseVO jobBatchResponseVO = JobBatchResponseVOConverter.INSTANCE.convert(jobTaskBatch, job); if (jobTaskBatch.getSystemTaskType().equals(SyetemTaskTypeEnum.WORKFLOW.getType())) { WorkflowNode workflowNode = workflowNodeMapper.selectById(jobTaskBatch.getWorkflowNodeId()); 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 1b571a1d..6a885481 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 @@ -85,7 +85,7 @@ public class JobServiceImpl implements JobService { .eq(Job::getDeleted, StatusEnum.NO.getStatus()) .orderByDesc(Job::getId)); - List jobResponseList = JobResponseVOConverter.INSTANCE.toJobResponseVOs(selectPage.getRecords()); + List jobResponseList = JobResponseVOConverter.INSTANCE.convertList(selectPage.getRecords()); return new PageResult<>(pageDTO, jobResponseList); } @@ -93,7 +93,7 @@ public class JobServiceImpl implements JobService { @Override public JobResponseVO getJobDetail(Long id) { Job job = jobMapper.selectById(id); - return JobResponseVOConverter.INSTANCE.toJobResponseVO(job); + return JobResponseVOConverter.INSTANCE.convert(job); } @Override @@ -116,7 +116,7 @@ public class JobServiceImpl implements JobService { .eq(Job::getDeleted, StatusEnum.NO.getStatus()) // SQLServer 分页必须 ORDER BY .orderByAsc(Job::getId)); - return JobResponseVOConverter.INSTANCE.toJobResponseVOs(selectPage.getRecords()); + return JobResponseVOConverter.INSTANCE.convertList(selectPage.getRecords()); } @Override @@ -166,7 +166,7 @@ public class JobServiceImpl implements JobService { @Override public Job updateJobResident(JobRequestVO jobRequestVO) { - Job job = JobConverter.INSTANCE.toJob(jobRequestVO); + Job job = JobConverter.INSTANCE.convert(jobRequestVO); job.setResident(StatusEnum.NO.getStatus()); if (Objects.equals(jobRequestVO.getTriggerType(), SystemConstants.WORKFLOW_TRIGGER_TYPE)) { return job; @@ -239,7 +239,7 @@ public class JobServiceImpl implements JobService { .eq(Job::getGroupName, groupName) .eq(Job::getDeleted, StatusEnum.NO.getStatus()) .orderByDesc(Job::getCreateDt)); - List jobResponseList = JobResponseVOConverter.INSTANCE.toJobResponseVOs(jobs); + List jobResponseList = JobResponseVOConverter.INSTANCE.convertList(jobs); return jobResponseList; } } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobTaskServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobTaskServiceImpl.java index 6a36818c..df099428 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobTaskServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobTaskServiceImpl.java @@ -38,7 +38,7 @@ public class JobTaskServiceImpl implements JobTaskService { // SQLServer 分页必须 ORDER BY .orderByAsc(JobTask::getJobId)); - List jobTaskResponseVOs = JobTaskResponseVOConverter.INSTANCE.toJobTaskResponseVOs( + List jobTaskResponseVOs = JobTaskResponseVOConverter.INSTANCE.convertList( selectPage.getRecords()); for (JobTaskResponseVO jobTaskResponseVO : jobTaskResponseVOs) { jobTaskResponseVO.setKey(jobTaskResponseVO.getId()); diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NamespaceServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NamespaceServiceImpl.java index 595c3298..f15c07d2 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NamespaceServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NamespaceServiceImpl.java @@ -77,7 +77,7 @@ public class NamespaceServiceImpl implements NamespaceService { .or().likeRight(Namespace::getUniqueId, keywords)) .orderByDesc(Namespace::getId)); return new PageResult<>(pageDTO, - NamespaceResponseVOConverter.INSTANCE.toNamespaceResponseVOs(selectPage.getRecords())); + NamespaceResponseVOConverter.INSTANCE.convertList(selectPage.getRecords())); } @Override @@ -91,6 +91,6 @@ public class NamespaceServiceImpl implements NamespaceService { new LambdaQueryWrapper() .select(Namespace::getName, Namespace::getUniqueId) ); - return NamespaceResponseVOConverter.INSTANCE.toNamespaceResponseVOs(namespaces); + return NamespaceResponseVOConverter.INSTANCE.convertList(namespaces); } } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyConfigServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyConfigServiceImpl.java index 40d06527..d8993047 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyConfigServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyConfigServiceImpl.java @@ -38,7 +38,6 @@ import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @author: opensnail @@ -71,7 +70,7 @@ public class NotifyConfigServiceImpl implements NotifyConfigService { return new PageResult<>(pageDTO, Lists.newArrayList()); } - List notifyConfigResponseVOS = NotifyConfigResponseVOConverter.INSTANCE.batchConvert( + List notifyConfigResponseVOS = NotifyConfigResponseVOConverter.INSTANCE.convertList( notifyConfigs); Map recipientNameMap = getRecipientNameMap(notifyConfigResponseVOS); @@ -138,7 +137,7 @@ public class NotifyConfigServiceImpl implements NotifyConfigService { @Override public Boolean saveNotify(NotifyConfigRequestVO requestVO) { - NotifyConfig notifyConfig = NotifyConfigConverter.INSTANCE.toNotifyConfig(requestVO); + NotifyConfig notifyConfig = NotifyConfigConverter.INSTANCE.convert(requestVO); notifyConfig.setCreateDt(LocalDateTime.now()); notifyConfig.setRecipientIds(JsonUtil.toJsonString(requestVO.getRecipientIds())); notifyConfig.setNamespaceId(UserSessionUtils.currentUserSession().getNamespaceId()); @@ -153,7 +152,7 @@ public class NotifyConfigServiceImpl implements NotifyConfigService { @Override public Boolean updateNotify(NotifyConfigRequestVO requestVO) { Assert.notNull(requestVO.getId(), () -> new SnailJobServerException("参数异常")); - NotifyConfig notifyConfig = NotifyConfigConverter.INSTANCE.toNotifyConfig(requestVO); + NotifyConfig notifyConfig = NotifyConfigConverter.INSTANCE.convert(requestVO); notifyConfig.setRecipientIds(JsonUtil.toJsonString(requestVO.getRecipientIds())); // 防止被覆盖 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 43a04f70..58d0469b 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 @@ -41,13 +41,13 @@ public class NotifyRecipientServiceImpl implements NotifyRecipientService { .orderByDesc(NotifyRecipient::getCreateDt)); return new PageResult<>(pageDTO, - NotifyRecipientConverter.INSTANCE.toNotifyRecipientResponseVOs(notifyRecipientPageDTO.getRecords())); + NotifyRecipientConverter.INSTANCE.convertList(notifyRecipientPageDTO.getRecords())); } @Override public Boolean saveNotifyRecipient(NotifyRecipientRequestVO requestVO) { String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId(); - NotifyRecipient notifyRecipient = NotifyRecipientConverter.INSTANCE.toNotifyRecipient(requestVO); + NotifyRecipient notifyRecipient = NotifyRecipientConverter.INSTANCE.convert(requestVO); notifyRecipient.setNamespaceId(namespaceId); return 1 == notifyRecipientMapper.insert(notifyRecipient); } @@ -55,7 +55,7 @@ public class NotifyRecipientServiceImpl implements NotifyRecipientService { @Override public Boolean updateNotifyRecipient(NotifyRecipientRequestVO requestVO) { String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId(); - NotifyRecipient notifyRecipient = NotifyRecipientConverter.INSTANCE.toNotifyRecipient(requestVO); + NotifyRecipient notifyRecipient = NotifyRecipientConverter.INSTANCE.convert(requestVO); notifyRecipient.setNamespaceId(namespaceId); return 1 == notifyRecipientMapper.updateById(notifyRecipient); } @@ -65,7 +65,7 @@ public class NotifyRecipientServiceImpl implements NotifyRecipientService { List notifyRecipients = notifyRecipientMapper.selectList( new LambdaQueryWrapper() .select(NotifyRecipient::getRecipientName, NotifyRecipient::getId)); - return NotifyRecipientConverter.INSTANCE.toCommonLabelValueResponseVOs(notifyRecipients); + return NotifyRecipientConverter.INSTANCE.convertListToCommonLabelValueResponseList(notifyRecipients); } @Override 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 6120bf20..16a19f95 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 @@ -72,7 +72,7 @@ public class RetryDeadLetterServiceImpl implements RetryDeadLetterService { .eq(StrUtil.isNotBlank(queryVO.getUniqueId()), RetryDeadLetter::getUniqueId, queryVO.getUniqueId())); return new PageResult<>(retryDeadLetterPageDTO, - RetryDeadLetterResponseVOConverter.INSTANCE.batchConvert(retryDeadLetterPageDTO.getRecords())); + RetryDeadLetterResponseVOConverter.INSTANCE.convertList(retryDeadLetterPageDTO.getRecords())); } @Override 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 966f2905..83b22681 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 @@ -65,7 +65,7 @@ public class RetryTaskLogServiceImpl implements RetryTaskLogService { return new PageResult<>( retryTaskLogPageDTO, - RetryTaskLogResponseVOConverter.INSTANCE.batchConvert(retryTaskLogPageDTO.getRecords())); + RetryTaskLogResponseVOConverter.INSTANCE.convertList(retryTaskLogPageDTO.getRecords())); } @Override diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskServiceImpl.java index 726a7cf3..02f2546e 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskServiceImpl.java @@ -101,7 +101,7 @@ public class RetryTaskServiceImpl implements RetryTaskService { .orderByDesc(RetryTask::getCreateDt); pageDTO = accessTemplate.getRetryTaskAccess().listPage(queryVO.getGroupName(), namespaceId, pageDTO, queryWrapper); return new PageResult<>(pageDTO, - RetryTaskResponseVOConverter.INSTANCE.toRetryTaskResponseVO(pageDTO.getRecords())); + RetryTaskResponseVOConverter.INSTANCE.convertList(pageDTO.getRecords())); } @Override @@ -110,7 +110,7 @@ public class RetryTaskServiceImpl implements RetryTaskService { RetryTask retryTask = retryTaskAccess.one(groupName, UserSessionUtils.currentUserSession().getNamespaceId(), new LambdaQueryWrapper() .eq(RetryTask::getId, id)); - return RetryTaskResponseVOConverter.INSTANCE.toRetryTaskResponseVO(retryTask); + return RetryTaskResponseVOConverter.INSTANCE.convert(retryTask); } @Override @@ -184,7 +184,7 @@ public class RetryTaskServiceImpl implements RetryTaskService { taskContext.setInitStatus(retryTaskRequestVO.getRetryStatus()); taskContext.setNamespaceId(namespaceId); taskContext.setTaskInfos( - Collections.singletonList(TaskContextConverter.INSTANCE.toTaskContextInfo(retryTaskRequestVO))); + Collections.singletonList(TaskContextConverter.INSTANCE.convert(retryTaskRequestVO))); // 生成任务 taskGenerator.taskGenerator(taskContext); @@ -307,7 +307,7 @@ public class RetryTaskServiceImpl implements RetryTaskService { taskContext.setGroupName(parseLogsVO.getGroupName()); taskContext.setNamespaceId(namespaceId); taskContext.setInitStatus(parseLogsVO.getRetryStatus()); - taskContext.setTaskInfos(TaskContextConverter.INSTANCE.toTaskContextInfo(retryTaskDTOS)); + taskContext.setTaskInfos(TaskContextConverter.INSTANCE.convert(retryTaskDTOS)); // 生成任务 taskGenerator.taskGenerator(taskContext); diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java index 20d9530d..294e3d6a 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java @@ -69,7 +69,7 @@ public class SceneConfigServiceImpl implements SceneConfigService { RetrySceneConfig::getSceneName, StrUtil.trim(queryVO.getSceneName())) .orderByDesc(RetrySceneConfig::getCreateDt)); - return new PageResult<>(pageDTO, SceneConfigResponseVOConverter.INSTANCE.batchConvert(pageDTO.getRecords())); + return new PageResult<>(pageDTO, SceneConfigResponseVOConverter.INSTANCE.convertList(pageDTO.getRecords())); } @@ -86,7 +86,7 @@ public class SceneConfigServiceImpl implements SceneConfigService { RetrySceneConfig::getDescription, RetrySceneConfig::getMaxRetryCount) .orderByDesc(RetrySceneConfig::getCreateDt)); - return SceneConfigResponseVOConverter.INSTANCE.batchConvert(retrySceneConfigs); + return SceneConfigResponseVOConverter.INSTANCE.convertList(retrySceneConfigs); } @Override @@ -103,7 +103,7 @@ public class SceneConfigServiceImpl implements SceneConfigService { ), () -> new SnailJobServerException("场景名称重复. {}", requestVO.getSceneName())); - RetrySceneConfig retrySceneConfig = SceneConfigConverter.INSTANCE.toSceneConfigRequestVO(requestVO); + RetrySceneConfig retrySceneConfig = SceneConfigConverter.INSTANCE.convert(requestVO); retrySceneConfig.setCreateDt(LocalDateTime.now()); retrySceneConfig.setNamespaceId(namespaceId); if (requestVO.getBackOff() == WaitStrategies.WaitStrategyEnum.DELAY_LEVEL.getType()) { @@ -123,7 +123,7 @@ public class SceneConfigServiceImpl implements SceneConfigService { @Override public Boolean updateSceneConfig(SceneConfigRequestVO requestVO) { checkExecuteInterval(requestVO); - RetrySceneConfig retrySceneConfig = SceneConfigConverter.INSTANCE.toSceneConfigRequestVO(requestVO); + RetrySceneConfig retrySceneConfig = SceneConfigConverter.INSTANCE.convert(requestVO); // 防止更新 retrySceneConfig.setSceneName(null); retrySceneConfig.setGroupName(null); diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SystemUserServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SystemUserServiceImpl.java index a033b58e..9df3c0c8 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SystemUserServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SystemUserServiceImpl.java @@ -97,7 +97,7 @@ public class SystemUserServiceImpl implements SystemUserService { List namespaces = namespaceMapper.selectList(queryWrapper); systemUserResponseVO.setNamespaceIds( - NamespaceResponseVOConverter.INSTANCE.toNamespaceResponseVOs(namespaces)); + NamespaceResponseVOConverter.INSTANCE.convertList(namespaces)); } @Override @@ -199,7 +199,7 @@ public class SystemUserServiceImpl implements SystemUserService { return new PageResult<>(userPageDTO, Collections.emptyList()); } - List userResponseVOList = SystemUserResponseVOConverter.INSTANCE.batchConvert( + List userResponseVOList = SystemUserResponseVOConverter.INSTANCE.convertList( userPageDTO.getRecords()); List userPermissions = systemUserPermissionMapper.selectList( Wrappers.lambdaQuery() @@ -253,7 +253,7 @@ public class SystemUserServiceImpl implements SystemUserService { new LambdaQueryWrapper() .select(SystemUserPermission::getNamespaceId, SystemUserPermission::getGroupName) .eq(SystemUserPermission::getSystemUserId, responseVO.getId())); - responseVO.setPermissions(PermissionsResponseVOConverter.INSTANCE.toPermissionsResponseVOs(systemUserPermissions)); + responseVO.setPermissions(PermissionsResponseVOConverter.INSTANCE.convertList(systemUserPermissions)); return responseVO; 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 3ea2b1c8..2d2ea960 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.toWorkflowBatchResponseVO(batchResponseDOList); + WorkflowConverter.INSTANCE.convertListToWorkflowBatchResponseList(batchResponseDOList); return new PageResult<>(pageDTO, batchResponseVOList); } @@ -101,7 +101,7 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService { Workflow workflow = workflowMapper.selectById(workflowTaskBatch.getWorkflowId()); - WorkflowDetailResponseVO responseVO = WorkflowConverter.INSTANCE.toWorkflowDetailResponseVO(workflow); + WorkflowDetailResponseVO responseVO = WorkflowConverter.INSTANCE.convert(workflow); List workflowNodes = workflowNodeMapper.selectList(new LambdaQueryWrapper() .eq(WorkflowNode::getDeleted, StatusEnum.NO.getStatus()) .eq(WorkflowNode::getWorkflowId, workflow.getId())); @@ -119,7 +119,7 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService { Map> jobTaskBatchMap = StreamUtils.groupByKey(alJobTaskBatchList, JobTaskBatch::getWorkflowNodeId); - List nodeInfos = WorkflowConverter.INSTANCE.toNodeInfo(workflowNodes); + List nodeInfos = WorkflowConverter.INSTANCE.convertList(workflowNodes); String flowInfo = workflowTaskBatch.getFlowInfo(); MutableGraph graph = MutableGraphCache.getOrDefault(id, flowInfo); @@ -138,7 +138,7 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService { jobTaskBatchList = jobTaskBatchList.stream() .sorted(Comparator.comparingInt(JobTaskBatch::getTaskBatchStatus)) .collect(Collectors.toList()); - nodeInfo.setJobBatchList(JobBatchResponseVOConverter.INSTANCE.jobTaskBatchToJobBatchResponseVOs(jobTaskBatchList)); + nodeInfo.setJobBatchList(JobBatchResponseVOConverter.INSTANCE.convertListToJobBatchResponseList(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 6c6d7dc4..3b2c18be 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 @@ -114,7 +114,7 @@ public class WorkflowServiceImpl implements WorkflowService { graph.addNode(SystemConstants.ROOT); // 组装工作流信息 - Workflow workflow = WorkflowConverter.INSTANCE.toWorkflow(workflowRequestVO); + Workflow workflow = WorkflowConverter.INSTANCE.convert(workflowRequestVO); workflow.setVersion(1); workflow.setNextTriggerAt(calculateNextTriggerAt(workflowRequestVO, DateUtils.toNowMilli())); workflow.setFlowInfo(StrUtil.EMPTY); @@ -162,7 +162,7 @@ public class WorkflowServiceImpl implements WorkflowService { return null; } - WorkflowDetailResponseVO responseVO = WorkflowConverter.INSTANCE.toWorkflowDetailResponseVO(workflow); + WorkflowDetailResponseVO responseVO = WorkflowConverter.INSTANCE.convert(workflow); List workflowNodes = workflowNodeMapper.selectList(new LambdaQueryWrapper() .eq(WorkflowNode::getDeleted, 0) .eq(WorkflowNode::getVersion, workflow.getVersion()) @@ -175,7 +175,7 @@ public class WorkflowServiceImpl implements WorkflowService { Map jobMap = StreamUtils.toIdentityMap(jobs, Job::getId); - List nodeInfos = WorkflowConverter.INSTANCE.toNodeInfo(workflowNodes); + List nodeInfos = WorkflowConverter.INSTANCE.convertList(workflowNodes); Map workflowNodeMap = nodeInfos.stream() .peek(nodeInfo -> { @@ -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.toWorkflowResponseVO(page.getRecords()); + List jobResponseList = WorkflowConverter.INSTANCE.convertListToWorkflowResponseList(page.getRecords()); return new PageResult<>(pageDTO, jobResponseList); } @@ -245,7 +245,7 @@ public class WorkflowServiceImpl implements WorkflowService { log.info("图构建完成. graph:[{}]", graph); // 保存图信息 - workflow = WorkflowConverter.INSTANCE.toWorkflow(workflowRequestVO); + workflow = WorkflowConverter.INSTANCE.convert(workflowRequestVO); workflow.setId(workflowRequestVO.getId()); workflow.setVersion(version); workflow.setNextTriggerAt(calculateNextTriggerAt(workflowRequestVO, DateUtils.toNowMilli())); @@ -320,7 +320,7 @@ public class WorkflowServiceImpl implements WorkflowService { .eq(Workflow::getDeleted, StatusEnum.NO.getStatus()) .orderByAsc(Workflow::getId)); - return WorkflowConverter.INSTANCE.toWorkflowResponseVO(selectPage.getRecords()); + return WorkflowConverter.INSTANCE.convertListToWorkflowResponseList(selectPage.getRecords()); } @Override