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

refactor: mapstruct函数统一风格: convert,convertList,convertToXxx,convertListToXxxxList

Browse Source
This commit is contained in:
dhb52 2024-05-10 12:52:19 +08:00
parent ed9c2d12ea
commit e7cf4e109c
42 changed files with 101 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,5 +17,5 @@ public interface DispatchQuantityResponseVOConverter {
DispatchQuantityResponseVOConverter INSTANCE = Mappers.getMapper(DispatchQuantityResponseVOConverter.class);
List<DashboardLineResponseVO> toDashboardLineResponseVO(List<DashboardLineResponseDO> dashboardLineResponseDOList);
List<DashboardLineResponseVO> convertList(List<DashboardLineResponseDO> dashboardLineResponseDOList);
}

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

@ -20,5 +20,5 @@ public interface GroupConfigConverter {
GroupConfig convert(GroupConfigRequestVO groupConfigRequestVO);
List<GroupConfig> batchConvert(List<GroupConfigRequestVO> groupConfigRequestVOS);
List<GroupConfig> convertList(List<GroupConfigRequestVO> groupConfigRequestVOS);
}

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

@ -17,7 +17,7 @@ public interface GroupConfigResponseVOConverter {
GroupConfigResponseVOConverter INSTANCE = Mappers.getMapper(GroupConfigResponseVOConverter.class);
GroupConfigResponseVO toGroupConfigResponseVO(GroupConfig groupConfig);
GroupConfigResponseVO convert(GroupConfig groupConfig);
List<GroupConfigResponseVO> toGroupConfigResponseVO(List<GroupConfig> groupConfigs);
List<GroupConfigResponseVO> convertList(List<GroupConfig> groupConfigs);
}

10
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobBatchResponseVOConverter.java
View File

@ -24,19 +24,19 @@ public interface JobBatchResponseVOConverter {
JobBatchResponseVOConverter INSTANCE = Mappers.getMapper(JobBatchResponseVOConverter.class);
List<JobBatchResponseVO> toJobBatchResponseVOs(List<JobBatchResponseDO> jobBatches);
List<JobBatchResponseVO> convertList(List<JobBatchResponseDO> jobBatches);
@Mappings({
@Mapping(target = "executionAt", expression = "java(JobBatchResponseVOConverter.toLocalDateTime(jobBatchResponseDO.getExecutionAt()))")
})
JobBatchResponseVO toJobBatchResponseVO(JobBatchResponseDO jobBatchResponseDO);
JobBatchResponseVO convert(JobBatchResponseDO jobBatchResponseDO);
List<JobBatchResponseVO> jobTaskBatchToJobBatchResponseVOs(List<JobTaskBatch> jobTaskBatchList);
List<JobBatchResponseVO> convertListToJobBatchResponseList(List<JobTaskBatch> 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) {

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

@ -15,6 +15,6 @@ public interface JobConverter {
JobConverter INSTANCE = Mappers.getMapper(JobConverter.class);
Job toJob(JobRequestVO jobRequestVO);
Job convert(JobRequestVO jobRequestVO);
}

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

@ -14,5 +14,5 @@ public interface JobNotifyConfigConverter {
JobNotifyConfigConverter INSTANCE = Mappers.getMapper(JobNotifyConfigConverter.class);
JobNotifyConfig toJobNotifyConfig(JobNotifyConfigRequestVO jobNotifyConfigVO);
JobNotifyConfig convert(JobNotifyConfigRequestVO jobNotifyConfigVO);
}

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

@ -19,5 +19,5 @@ public interface JobNotifyConfigResponseVOConverter {
JobNotifyConfigResponseVO convert(JobNotifyConfig jobNotifyConfig);
List<JobNotifyConfigResponseVO> batchConvert(List<JobNotifyConfigResponseDO> jobNotifyConfigs);
List<JobNotifyConfigResponseVO> convertList(List<JobNotifyConfigResponseDO> jobNotifyConfigs);
}

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

@ -25,12 +25,12 @@ public interface JobResponseVOConverter {
// @Mappings({
// @Mapping(source = "nextTriggerAt", target = "nextTriggerAt", expression = "java(DateUtils.toLocalDateTime())")
// })
List<JobResponseVO> toJobResponseVOs(List<Job> jobs);
List<JobResponseVO> convertList(List<Job> 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) {

6
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobSummaryResponseVOConverter.java
View File

@ -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<Task> toDashboardRetryLineResponseVO(List<DashboardRetryLineResponseDO.Task> taskList);
List<Task> convertList(List<DashboardRetryLineResponseDO.Task> taskList);
static BigDecimal toSuccessRate(Integer successNum, Integer totalNum) {
if (Objects.isNull(totalNum) || totalNum == 0) {

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

@ -22,5 +22,5 @@ public interface JobTaskResponseVOConverter {
@Mappings(
@Mapping(source = "id", target = "key")
)
List<JobTaskResponseVO> toJobTaskResponseVOs(List<JobTask> jobTasks);
List<JobTaskResponseVO> convertList(List<JobTask> jobTasks);
}

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

@ -17,5 +17,5 @@ public interface NamespaceResponseVOConverter {
NamespaceResponseVOConverter INSTANCE = Mappers.getMapper(NamespaceResponseVOConverter.class);
List<NamespaceResponseVO> toNamespaceResponseVOs(List<Namespace> namespaces);
List<NamespaceResponseVO> convertList(List<Namespace> namespaces);
}

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

@ -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);
}

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

@ -27,7 +27,7 @@ public interface NotifyConfigResponseVOConverter {
})
NotifyConfigResponseVO convert(NotifyConfig notifyConfig);
List<NotifyConfigResponseVO> batchConvert(List<NotifyConfig> notifyConfigs);
List<NotifyConfigResponseVO> convertList(List<NotifyConfig> notifyConfigs);
static Set<Long> toNotifyRecipientIds(String notifyRecipientIdsStr) {
if (StrUtil.isBlank(notifyRecipientIdsStr)) {

8
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyRecipientConverter.java
View File

@ -21,15 +21,15 @@ public interface NotifyRecipientConverter {
NotifyRecipientConverter INSTANCE = Mappers.getMapper(NotifyRecipientConverter.class);
List<NotifyRecipientResponseVO> toNotifyRecipientResponseVOs(List<NotifyRecipient> notifyRecipients);
List<NotifyRecipientResponseVO> convertList(List<NotifyRecipient> notifyRecipients);
NotifyRecipient toNotifyRecipient(NotifyRecipientRequestVO requestVO);
NotifyRecipient convert(NotifyRecipientRequestVO requestVO);
List<CommonLabelValueResponseVO> toCommonLabelValueResponseVOs(List<NotifyRecipient> notifyRecipients);
List<CommonLabelValueResponseVO> convertListToCommonLabelValueResponseList(List<NotifyRecipient> notifyRecipients);
@Mappings({
@Mapping(target = "label", source = "recipientName"),
@Mapping(target = "value", source = "id")
})
CommonLabelValueResponseVO toCommonLabelValueResponseVO(NotifyRecipient notifyRecipient);
CommonLabelValueResponseVO convert(NotifyRecipient notifyRecipient);
}

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

@ -17,6 +17,6 @@ public interface PermissionsResponseVOConverter {
PermissionsResponseVOConverter INSTANCE = Mappers.getMapper(PermissionsResponseVOConverter.class);
List<PermissionsResponseVO> toPermissionsResponseVOs(List<SystemUserPermission> systemUserPermissionList);
List<PermissionsResponseVO> convertList(List<SystemUserPermission> systemUserPermissionList);
}

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

@ -18,5 +18,5 @@ public interface RetryDeadLetterResponseVOConverter {
RetryDeadLetterResponseVO convert(RetryDeadLetter retryDeadLetter);
List<RetryDeadLetterResponseVO> batchConvert(List<RetryDeadLetter> retryDeadLetters);
List<RetryDeadLetterResponseVO> convertList(List<RetryDeadLetter> retryDeadLetters);
}

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

@ -15,5 +15,5 @@ public interface RetrySummaryResponseVOConverter {
RetrySummaryResponseVOConverter INSTANCE = Mappers.getMapper(RetrySummaryResponseVOConverter.class);
RetryTask toRetryTask(DashboardCardResponseDO.RetryTask retryTask);
RetryTask convert(DashboardCardResponseDO.RetryTask retryTask);
}

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

@ -18,6 +18,6 @@ public interface RetryTaskLogResponseVOConverter {
RetryTaskLogResponseVO convert(RetryTaskLog retryTaskLog);
List<RetryTaskLogResponseVO> batchConvert(List<RetryTaskLog> retryTaskLogs);
List<RetryTaskLogResponseVO> convertList(List<RetryTaskLog> retryTaskLogs);
}

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

@ -17,7 +17,7 @@ public interface RetryTaskResponseVOConverter {
RetryTaskResponseVOConverter INSTANCE = Mappers.getMapper(RetryTaskResponseVOConverter.class);
RetryTaskResponseVO toRetryTaskResponseVO(RetryTask retryTask);
RetryTaskResponseVO convert(RetryTask retryTask);
List<RetryTaskResponseVO> toRetryTaskResponseVO(List<RetryTask> retryTasks);
List<RetryTaskResponseVO> convertList(List<RetryTask> retryTasks);
}

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

@ -14,6 +14,6 @@ public interface SceneConfigConverter {
SceneConfigConverter INSTANCE = Mappers.getMapper(SceneConfigConverter.class);
RetrySceneConfig toSceneConfigRequestVO(SceneConfigRequestVO requestVO);
RetrySceneConfig convert(SceneConfigRequestVO requestVO);
}

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

@ -18,5 +18,5 @@ public interface SceneConfigResponseVOConverter {
SceneConfigResponseVO convert(RetrySceneConfig retrySceneConfig);
List<SceneConfigResponseVO> batchConvert(List<RetrySceneConfig> retrySceneConfigs);
List<SceneConfigResponseVO> convertList(List<RetrySceneConfig> retrySceneConfigs);
}

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

@ -17,5 +17,5 @@ public interface SceneQuantityRankResponseVOConverter {
SceneQuantityRankResponseVOConverter INSTANCE = Mappers.getMapper(SceneQuantityRankResponseVOConverter.class);
List<Rank> toDashboardRetryLineResponseVORank(List<DashboardRetryLineResponseDO.Rank> rankList);
List<Rank> convertList(List<DashboardRetryLineResponseDO.Rank> rankList);
}

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

@ -17,6 +17,6 @@ public interface ServerNodeResponseVOConverter {
ServerNodeResponseVOConverter INSTANCE = Mappers.getMapper(ServerNodeResponseVOConverter.class);
List<ServerNodeResponseVO> toServerNodeResponseVO(List<ServerNode> serverNodes);
List<ServerNodeResponseVO> convertList(List<ServerNode> serverNodes);
}

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

@ -22,5 +22,5 @@ public interface SystemUserResponseVOConverter {
SystemUserResponseVO convert(SystemUser systemUser);
List<SystemUserResponseVO> batchConvert(List<SystemUser> systemUsers);
List<SystemUserResponseVO> convertList(List<SystemUser> systemUsers);
}

5
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/TaskContextConverter.java
View File

@ -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<TaskContext.TaskInfo> toTaskContextInfo(List<RetryTaskDTO> retryTasks);
List<TaskContext.TaskInfo> convert(List<RetryTaskDTO> retryTasks);
}

18
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/WorkflowConverter.java
View File

@ -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<WorkflowDetailResponseVO.NodeInfo> toNodeInfo(List<WorkflowNode> workflowNodes);
List<WorkflowDetailResponseVO.NodeInfo> convertList(List<WorkflowNode> 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<WorkflowResponseVO> toWorkflowResponseVO(List<Workflow> workflowList);
List<WorkflowResponseVO> convertListToWorkflowResponseList(List<Workflow> workflowList);
@Mappings({
@Mapping(target = "nextTriggerAt", expression = "java(WorkflowConverter.toLocalDateTime(workflow.getNextTriggerAt()))")
})
WorkflowResponseVO toWorkflowResponseVO(Workflow workflow);
WorkflowResponseVO convertToWorkflowResponseVO(Workflow workflow);
List<WorkflowBatchResponseVO> toWorkflowBatchResponseVO(List<WorkflowBatchResponseDO> workflowBatchResponseList);
List<WorkflowBatchResponseVO> convertListToWorkflowBatchResponseList(List<WorkflowBatchResponseDO> 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) {

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

@ -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());

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

@ -89,7 +89,7 @@ public class DashBoardServiceImpl implements DashBoardService {
new LambdaQueryWrapper<RetrySummary>()
.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<DashboardRetryLineResponseDO.Task> page = retrySummaryMapper.retryTaskList(wrapper, pager);
List<DashboardRetryLineResponseVO.Task> taskList = JobSummaryResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVO(page.getRecords());
List<DashboardRetryLineResponseVO.Task> taskList = JobSummaryResponseVOConverter.INSTANCE.convertList(page.getRecords());
PageResult<List<Task>> 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<DashboardLineResponseVO> dashboardLineResponseVOList = DispatchQuantityResponseVOConverter.INSTANCE.toDashboardLineResponseVO(dashboardRetryLinkeResponseDOList);
List<DashboardLineResponseVO> 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<DashboardRetryLineResponseVO.Rank> ranks = SceneQuantityRankResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVORank(rankList);
List<DashboardRetryLineResponseVO.Rank> ranks = SceneQuantityRankResponseVOConverter.INSTANCE.convertList(rankList);
responseVO.setRankList(ranks);
return responseVO;
}
@ -233,7 +233,7 @@ public class DashBoardServiceImpl implements DashBoardService {
}
IPage<DashboardRetryLineResponseDO.Task> page = jobSummaryMapper.jobTaskList(wrapper, pager);
List<DashboardRetryLineResponseVO.Task> taskList = JobSummaryResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVO(page.getRecords());
List<DashboardRetryLineResponseVO.Task> taskList = JobSummaryResponseVOConverter.INSTANCE.convertList(page.getRecords());
PageResult<List<DashboardRetryLineResponseVO.Task>> 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<DashboardLineResponseVO> dashboardLineResponseVOList = DispatchQuantityResponseVOConverter.INSTANCE.toDashboardLineResponseVO(dashboardLineResponseDOList);
List<DashboardLineResponseVO> 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<DashboardRetryLineResponseVO.Rank> ranks = SceneQuantityRankResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVORank(rankList);
List<DashboardRetryLineResponseVO.Rank> 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<ServerNode> serverNodePageDTO = serverNodeMapper.selectPage(pageDTO, serverNodeLambdaQueryWrapper);
List<ServerNodeResponseVO> responseVOList = ServerNodeResponseVOConverter.INSTANCE.toServerNodeResponseVO(serverNodePageDTO.getRecords());
List<ServerNodeResponseVO> responseVOList = ServerNodeResponseVOConverter.INSTANCE.convertList(serverNodePageDTO.getRecords());
for (final ServerNodeResponseVO serverNodeResponseVO : responseVOList) {
if (NodeTypeEnum.CLIENT.getType().equals(serverNodeResponseVO.getNodeType())) {

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

@ -189,7 +189,7 @@ public class GroupConfigServiceImpl implements GroupConfigService {
PageResult<List<GroupConfigResponseVO>> pageResult = new PageResult<>(groupConfigPageDTO.getCurrent(),
groupConfigPageDTO.getSize(), groupConfigPageDTO.getTotal());
List<GroupConfigResponseVO> responseVOList = GroupConfigResponseVOConverter.INSTANCE.toGroupConfigResponseVO(
List<GroupConfigResponseVO> 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<String, String> namespaceMap = StreamUtils.toMap(namespaces, Namespace::getUniqueId, Namespace::getName);
List<GroupConfigResponseVO> groupConfigResponses = GroupConfigResponseVOConverter.INSTANCE.toGroupConfigResponseVO(
List<GroupConfigResponseVO> groupConfigResponses = GroupConfigResponseVOConverter.INSTANCE.convertList(
groupConfigs);
for (final GroupConfigResponseVO groupConfigResponseVO : groupConfigResponses) {
groupConfigResponseVO.setNamespaceName(namespaceMap.get(groupConfigResponseVO.getNamespaceId()));

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

@ -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<JobBatchResponseDO> batchResponseDOList = jobTaskBatchMapper.selectJobBatchPageList(pageDTO, wrapper);
List<JobBatchResponseVO> batchResponseVOList = JobBatchResponseVOConverter.INSTANCE.toJobBatchResponseVOs(
List<JobBatchResponseVO> 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());

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

@ -85,7 +85,7 @@ public class JobServiceImpl implements JobService {
.eq(Job::getDeleted, StatusEnum.NO.getStatus())
.orderByDesc(Job::getId));
List<JobResponseVO> jobResponseList = JobResponseVOConverter.INSTANCE.toJobResponseVOs(selectPage.getRecords());
List<JobResponseVO> 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<JobResponseVO> jobResponseList = JobResponseVOConverter.INSTANCE.toJobResponseVOs(jobs);
List<JobResponseVO> jobResponseList = JobResponseVOConverter.INSTANCE.convertList(jobs);
return jobResponseList;
}
}

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

@ -38,7 +38,7 @@ public class JobTaskServiceImpl implements JobTaskService {
// SQLServer 分页必须 ORDER BY
.orderByAsc(JobTask::getJobId));
List<JobTaskResponseVO> jobTaskResponseVOs = JobTaskResponseVOConverter.INSTANCE.toJobTaskResponseVOs(
List<JobTaskResponseVO> jobTaskResponseVOs = JobTaskResponseVOConverter.INSTANCE.convertList(
selectPage.getRecords());
for (JobTaskResponseVO jobTaskResponseVO : jobTaskResponseVOs) {
jobTaskResponseVO.setKey(jobTaskResponseVO.getId());

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

@ -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<Namespace>()
.select(Namespace::getName, Namespace::getUniqueId)
);
return NamespaceResponseVOConverter.INSTANCE.toNamespaceResponseVOs(namespaces);
return NamespaceResponseVOConverter.INSTANCE.convertList(namespaces);
}
}

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

@ -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<NotifyConfigResponseVO> notifyConfigResponseVOS = NotifyConfigResponseVOConverter.INSTANCE.batchConvert(
List<NotifyConfigResponseVO> notifyConfigResponseVOS = NotifyConfigResponseVOConverter.INSTANCE.convertList(
notifyConfigs);
Map<Long, String> 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()));
// 防止被覆盖

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

@ -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<NotifyRecipient> notifyRecipients = notifyRecipientMapper.selectList(
new LambdaQueryWrapper<NotifyRecipient>()
.select(NotifyRecipient::getRecipientName, NotifyRecipient::getId));
return NotifyRecipientConverter.INSTANCE.toCommonLabelValueResponseVOs(notifyRecipients);
return NotifyRecipientConverter.INSTANCE.convertListToCommonLabelValueResponseList(notifyRecipients);
}
@Override

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

@ -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

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

@ -65,7 +65,7 @@ public class RetryTaskLogServiceImpl implements RetryTaskLogService {
return new PageResult<>(
retryTaskLogPageDTO,
RetryTaskLogResponseVOConverter.INSTANCE.batchConvert(retryTaskLogPageDTO.getRecords()));
RetryTaskLogResponseVOConverter.INSTANCE.convertList(retryTaskLogPageDTO.getRecords()));
}
@Override

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

@ -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<RetryTask>()
.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);

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

@ -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);

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

@ -97,7 +97,7 @@ public class SystemUserServiceImpl implements SystemUserService {
List<Namespace> 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<SystemUserResponseVO> userResponseVOList = SystemUserResponseVOConverter.INSTANCE.batchConvert(
List<SystemUserResponseVO> userResponseVOList = SystemUserResponseVOConverter.INSTANCE.convertList(
userPageDTO.getRecords());
List<SystemUserPermission> userPermissions = systemUserPermissionMapper.selectList(
Wrappers.<SystemUserPermission>lambdaQuery()
@ -253,7 +253,7 @@ public class SystemUserServiceImpl implements SystemUserService {
new LambdaQueryWrapper<SystemUserPermission>()
.select(SystemUserPermission::getNamespaceId, SystemUserPermission::getGroupName)
.eq(SystemUserPermission::getSystemUserId, responseVO.getId()));
responseVO.setPermissions(PermissionsResponseVOConverter.INSTANCE.toPermissionsResponseVOs(systemUserPermissions));
responseVO.setPermissions(PermissionsResponseVOConverter.INSTANCE.convertList(systemUserPermissions));
return responseVO;

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

@ -83,7 +83,7 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService {
List<WorkflowBatchResponseDO> batchResponseDOList = workflowTaskBatchMapper.selectWorkflowBatchPageList(pageDTO, wrapper);
List<WorkflowBatchResponseVO> 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<WorkflowNode> workflowNodes = workflowNodeMapper.selectList(new LambdaQueryWrapper<WorkflowNode>()
.eq(WorkflowNode::getDeleted, StatusEnum.NO.getStatus())
.eq(WorkflowNode::getWorkflowId, workflow.getId()));
@ -119,7 +119,7 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService {
Map<Long, List<JobTaskBatch>> jobTaskBatchMap = StreamUtils.groupByKey(alJobTaskBatchList,
JobTaskBatch::getWorkflowNodeId);
List<WorkflowDetailResponseVO.NodeInfo> nodeInfos = WorkflowConverter.INSTANCE.toNodeInfo(workflowNodes);
List<WorkflowDetailResponseVO.NodeInfo> nodeInfos = WorkflowConverter.INSTANCE.convertList(workflowNodes);
String flowInfo = workflowTaskBatch.getFlowInfo();
MutableGraph<Long> 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);

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

@ -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<WorkflowNode> workflowNodes = workflowNodeMapper.selectList(new LambdaQueryWrapper<WorkflowNode>()
.eq(WorkflowNode::getDeleted, 0)
.eq(WorkflowNode::getVersion, workflow.getVersion())
@ -175,7 +175,7 @@ public class WorkflowServiceImpl implements WorkflowService {
Map<Long, Job> jobMap = StreamUtils.toIdentityMap(jobs, Job::getId);
List<WorkflowDetailResponseVO.NodeInfo> nodeInfos = WorkflowConverter.INSTANCE.toNodeInfo(workflowNodes);
List<WorkflowDetailResponseVO.NodeInfo> nodeInfos = WorkflowConverter.INSTANCE.convertList(workflowNodes);
Map<Long, WorkflowDetailResponseVO.NodeInfo> 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<WorkflowResponseVO> jobResponseList = WorkflowConverter.INSTANCE.toWorkflowResponseVO(page.getRecords());
List<WorkflowResponseVO> 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