From d0da908ea72b6bb33afde98a3fd77cca2dc84e3c Mon Sep 17 00:00:00 2001 From: zhuangdashia Date: Tue, 1 Jul 2025 00:31:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E5=90=8Dbug=E4=BF=AE=E5=A4=8D=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=9C=BA=E5=99=A8=E3=80=81=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=97=A5=E5=BF=97=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E7=BB=84=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/vo/JobBatchResponseVO.java | 5 ++++ .../common/vo/WorkflowBatchResponseVO.java | 6 +++++ .../server/common/vo/WorkflowResponseVO.java | 5 ++++ .../web/model/response/JobResponseVO.java | 5 ++++ .../response/NotifyConfigResponseVO.java | 5 ++++ .../response/RetryDeadLetterResponseVO.java | 2 ++ .../web/model/response/RetryResponseVO.java | 2 ++ .../model/response/RetryTaskResponseVO.java | 2 ++ .../model/response/SceneConfigResponseVO.java | 2 ++ .../model/response/ServerNodeResponseVO.java | 2 ++ .../service/impl/DashboardServiceImpl.java | 25 +++++++++++++++--- .../web/service/impl/JobBatchServiceImpl.java | 2 +- .../web/service/impl/JobServiceImpl.java | 2 +- .../web/service/impl/JobTaskServiceImpl.java | 26 ++++++++++++++++--- .../service/impl/NotifyConfigServiceImpl.java | 2 +- .../impl/RetryDeadLetterServiceImpl.java | 2 +- .../web/service/impl/RetryServiceImpl.java | 2 +- .../service/impl/RetryTaskServiceImpl.java | 2 +- .../service/impl/SceneConfigServiceImpl.java | 2 +- .../impl/WorkflowBatchServiceImpl.java | 2 +- .../web/service/impl/WorkflowServiceImpl.java | 2 +- 21 files changed, 88 insertions(+), 17 deletions(-) diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/JobBatchResponseVO.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/JobBatchResponseVO.java index b367a18e..dab3f407 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/JobBatchResponseVO.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/JobBatchResponseVO.java @@ -21,6 +21,11 @@ public class JobBatchResponseVO { */ private String groupName; + /** + * 组名称中文 + */ + private String groupNameCn; + /** * 名称 */ diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/WorkflowBatchResponseVO.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/WorkflowBatchResponseVO.java index 5f4f5bbd..48804b5a 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/WorkflowBatchResponseVO.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/WorkflowBatchResponseVO.java @@ -19,6 +19,12 @@ public class WorkflowBatchResponseVO { */ private String groupName; + /** + * 组名称中文 + */ + private String groupNameCn; + + /** * 工作流任务id */ diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/WorkflowResponseVO.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/WorkflowResponseVO.java index c7d05203..f82a5c55 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/WorkflowResponseVO.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/vo/WorkflowResponseVO.java @@ -25,6 +25,11 @@ public class WorkflowResponseVO { */ private String groupName; + /** + * 组名称中文 + */ + private String groupNameCn; + /** * 触发类型 */ diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/JobResponseVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/JobResponseVO.java index db9e105d..5a00c438 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/JobResponseVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/JobResponseVO.java @@ -20,6 +20,11 @@ public class JobResponseVO { */ private String groupName; + /** + * 组名称中文 + */ + private String groupNameCn; + /** * 名称 */ diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/NotifyConfigResponseVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/NotifyConfigResponseVO.java index 64fec61c..7e6075ec 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/NotifyConfigResponseVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/NotifyConfigResponseVO.java @@ -14,6 +14,11 @@ public class NotifyConfigResponseVO implements Serializable { private String groupName; + /** + * 组名称中文 + */ + private String groupNameCn; + /** * 业务id (scene_name或job_id或workflow_id) */ diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryDeadLetterResponseVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryDeadLetterResponseVO.java index 8efc36ac..7c1baddf 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryDeadLetterResponseVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryDeadLetterResponseVO.java @@ -15,6 +15,8 @@ public class RetryDeadLetterResponseVO { private String groupName; + private String groupNameCn; + private String sceneName; private String idempotentId; diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryResponseVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryResponseVO.java index 10c57b02..df829934 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryResponseVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryResponseVO.java @@ -19,6 +19,8 @@ public class RetryResponseVO { private String groupName; + private String groupNameCn; + private String sceneName; private String idempotentId; diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryTaskResponseVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryTaskResponseVO.java index 6e4e3d19..095a0dad 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryTaskResponseVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/RetryTaskResponseVO.java @@ -15,6 +15,8 @@ public class RetryTaskResponseVO { private String groupName; + private String groupNameCn; + private String sceneName; private Integer taskStatus; diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/SceneConfigResponseVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/SceneConfigResponseVO.java index 607717a4..cb510796 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/SceneConfigResponseVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/SceneConfigResponseVO.java @@ -16,6 +16,8 @@ public class SceneConfigResponseVO { private String groupName; + private String groupNameCn; + private String sceneName; private Integer sceneStatus; diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/ServerNodeResponseVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/ServerNodeResponseVO.java index 52845bf5..69c6129b 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/ServerNodeResponseVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/ServerNodeResponseVO.java @@ -15,6 +15,8 @@ public class ServerNodeResponseVO { private String groupName; + private String groupNameCn; + private String hostId; private String hostIp; 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 07ca6b8b..aee7ce02 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 @@ -22,12 +22,10 @@ import com.aizuda.snailjob.server.web.model.request.JobLineQueryVo; import com.aizuda.snailjob.server.web.model.request.LineQueryVO; import com.aizuda.snailjob.server.web.model.request.ServerNodeQueryVO; import com.aizuda.snailjob.server.web.model.request.UserSessionVO; -import com.aizuda.snailjob.server.web.model.response.DashboardCardResponseVO; -import com.aizuda.snailjob.server.web.model.response.DashboardLineResponseVO; -import com.aizuda.snailjob.server.web.model.response.DashboardRetryLineResponseVO; +import com.aizuda.snailjob.server.web.model.response.*; import com.aizuda.snailjob.server.web.model.response.DashboardRetryLineResponseVO.Task; -import com.aizuda.snailjob.server.web.model.response.ServerNodeResponseVO; import com.aizuda.snailjob.server.web.service.DashboardService; +import com.aizuda.snailjob.server.web.service.GroupConfigService; import com.aizuda.snailjob.server.web.service.convert.*; import com.aizuda.snailjob.server.web.util.UserSessionUtils; import com.aizuda.snailjob.template.datasource.persistence.dataobject.ActivePodQuantityResponseDO; @@ -73,6 +71,7 @@ public class DashboardServiceImpl implements DashboardService { private final JobSummaryMapper jobSummaryMapper; private final RetrySummaryMapper retrySummaryMapper; private final ServerProperties serverProperties; + private final GroupConfigService groupConfigService; @Override public DashboardCardResponseVO taskRetryJob() { @@ -311,6 +310,24 @@ public class DashboardServiceImpl implements DashboardService { SnailJobLog.LOCAL.error("Failed to retrieve consumer group for node [{}:{}].", serverNodeResponseVO.getHostIp(), serverNodeExtAttrs.getWebPort()); } } + + //组中文名显示 TODO 在线机器无组？ + Set uniqueGroupNames = responseVOList.stream() + .map(ServerNodeResponseVO::getGroupName) + .filter(StrUtil::isNotBlank) + .collect(Collectors.toSet()); + + Map groupConfigMap = groupConfigService.getGroupNameCns(uniqueGroupNames); + + // 遍历结果，设置groupNameCn + for (ServerNodeResponseVO responseVO : responseVOList) { +// GroupConfigResponseVO groupConfig = groupConfigMap.get(responseVO.getGroupName()); +// if (groupConfig != null) { +// responseVO.setGroupNameCn(groupConfig.getGroupNameCn()); +// } + responseVO.setGroupNameCn(responseVO.getGroupName()); + } + return new PageResult<>(serverNodePageDTO, responseVOList); } 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 e22083b4..cd77b59c 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 @@ -87,7 +87,7 @@ public class JobBatchServiceImpl implements JobBatchService { for (JobBatchResponseVO jobResponseVO : batchResponseVOList) { GroupConfigResponseVO groupConfig = groupConfigMap.get(jobResponseVO.getGroupName()); if (groupConfig != null) { - jobResponseVO.setGroupName(groupConfig.getGroupNameCn()); + jobResponseVO.setGroupNameCn(groupConfig.getGroupNameCn()); } } 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 3417f210..ed18b45c 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 @@ -125,7 +125,7 @@ public class JobServiceImpl implements JobService { for (JobResponseVO jobResponseVO : jobResponseList) { GroupConfigResponseVO groupConfig = groupConfigMap.get(jobResponseVO.getGroupName()); if (groupConfig != null) { - jobResponseVO.setGroupName(groupConfig.getGroupNameCn()); + jobResponseVO.setGroupNameCn(groupConfig.getGroupNameCn()); } } 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 67b8fcbc..f8c20d79 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 @@ -1,10 +1,13 @@ package com.aizuda.snailjob.server.web.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.util.StreamUtils; import com.aizuda.snailjob.server.web.model.base.PageResult; import com.aizuda.snailjob.server.web.model.request.JobTaskQueryVO; +import com.aizuda.snailjob.server.web.model.response.GroupConfigResponseVO; import com.aizuda.snailjob.server.web.model.response.JobTaskResponseVO; +import com.aizuda.snailjob.server.web.service.GroupConfigService; import com.aizuda.snailjob.server.web.service.JobTaskService; import com.aizuda.snailjob.server.web.service.convert.JobTaskResponseVOConverter; import com.aizuda.snailjob.template.datasource.persistence.mapper.JobLogMessageMapper; @@ -15,10 +18,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.Set; +import java.util.*; +import java.util.stream.Collectors; /** * @author: opensnail @@ -30,6 +31,7 @@ import java.util.Set; public class JobTaskServiceImpl implements JobTaskService { private final JobTaskMapper jobTaskMapper; private final JobLogMessageMapper jobLogMessageMapper; + private final GroupConfigService groupConfigService; @Override public PageResult> getJobTaskPage(final JobTaskQueryVO queryVO) { @@ -46,6 +48,22 @@ public class JobTaskServiceImpl implements JobTaskService { List records = selectPage.getRecords(); + //组中文名显示 + Set uniqueGroupNames = records.stream() + .map(JobTask::getGroupName) + .filter(StrUtil::isNotBlank) + .collect(Collectors.toSet()); + + Map groupConfigMap = groupConfigService.getGroupNameCns(uniqueGroupNames); + + // 遍历结果，设置groupNameCn + for (JobTask responseVO : records) { + GroupConfigResponseVO groupConfig = groupConfigMap.get(responseVO.getGroupName()); + if (groupConfig != null) { + responseVO.setGroupName(groupConfig.getGroupNameCn()); + } + } + return new PageResult<>(pageDTO, convertJobTaskList(records)); } 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 b853a600..cb889132 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 @@ -81,7 +81,7 @@ public class NotifyConfigServiceImpl implements NotifyConfigService { for (NotifyConfigResponseVO responseVO : notifyConfigResponseVOS) { GroupConfigResponseVO groupConfig = groupConfigMap.get(responseVO.getGroupName()); if (groupConfig != null) { - responseVO.setGroupName(groupConfig.getGroupNameCn()); + responseVO.setGroupNameCn(groupConfig.getGroupNameCn()); } } 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 cd3f45ca..9329bf6a 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 @@ -84,7 +84,7 @@ public class RetryDeadLetterServiceImpl implements RetryDeadLetterService { for (RetryDeadLetterResponseVO responseVO : retryDeadLetterResponseVOS) { GroupConfigResponseVO groupConfig = groupConfigMap.get(responseVO.getGroupName()); if (groupConfig != null) { - responseVO.setGroupName(groupConfig.getGroupNameCn()); + responseVO.setGroupNameCn(groupConfig.getGroupNameCn()); } } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryServiceImpl.java index 615afee2..21f52808 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryServiceImpl.java @@ -143,7 +143,7 @@ public class RetryServiceImpl implements RetryService { for (RetryResponseVO retryResponseVO : retryResponseList) { GroupConfigResponseVO groupConfig = groupConfigMap.get(retryResponseVO.getGroupName()); if (groupConfig != null) { - retryResponseVO.setGroupName(groupConfig.getGroupNameCn()); + retryResponseVO.setGroupNameCn(groupConfig.getGroupNameCn()); } } 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 2dfc6723..4d6e3954 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 @@ -107,7 +107,7 @@ public class RetryTaskServiceImpl implements RetryTaskService { for (RetryTaskResponseVO responseVO : retryTaskResponseVOS) { GroupConfigResponseVO groupConfig = groupConfigMap.get(responseVO.getGroupName()); if (groupConfig != null) { - responseVO.setGroupName(groupConfig.getGroupNameCn()); + responseVO.setGroupNameCn(groupConfig.getGroupNameCn()); } } 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 b89cc6bd..3a3305a6 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 @@ -95,7 +95,7 @@ public class SceneConfigServiceImpl implements SceneConfigService { for (SceneConfigResponseVO responseVO : sceneConfigResponseVOS) { GroupConfigResponseVO groupConfig = groupConfigMap.get(responseVO.getGroupName()); if (groupConfig != null) { - responseVO.setGroupName(groupConfig.getGroupNameCn()); + responseVO.setGroupNameCn(groupConfig.getGroupNameCn()); } } 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 2ddaa4d2..e7940438 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 @@ -110,7 +110,7 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService { for (WorkflowBatchResponseVO workflowBatchResponseVO : batchResponseVOList) { GroupConfigResponseVO groupConfig = groupConfigMap.get(workflowBatchResponseVO.getGroupName()); if (groupConfig != null) { - workflowBatchResponseVO.setGroupName(groupConfig.getGroupNameCn()); + workflowBatchResponseVO.setGroupNameCn(groupConfig.getGroupNameCn()); } } 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 70787d2c..8097a156 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowServiceImpl.java @@ -215,7 +215,7 @@ public class WorkflowServiceImpl implements WorkflowService { for (WorkflowResponseVO workflowResponseVO : jobResponseList) { GroupConfigResponseVO groupConfig = groupConfigMap.get(workflowResponseVO.getGroupName()); if (groupConfig != null) { - workflowResponseVO.setGroupName(groupConfig.getGroupNameCn()); + workflowResponseVO.setGroupNameCn(groupConfig.getGroupNameCn()); } }