From 8c58aca24717e546018faef64499722bf541dc46 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Fri, 29 Mar 2024 05:37:55 +0000 Subject: [PATCH] =?UTF-8?q?fix(3.2.0)=20Dashboard=E5=AF=B9=E5=BA=94mapper?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=B0=91=E5=8F=82=E6=95=B0=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=20*=20style:=20?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96mysql=E7=9A=84SQL=E6=96=87=E4=BB=B6?= =?UTF-8?q?=20*=20style:=20=E6=A0=BC=E5=BC=8F=E5=8C=96mysql=E7=9A=84mapper?= =?UTF-8?q?.xml=E6=96=87=E4=BB=B6=20*=20fix:=20Dashboard=E5=AF=B9=E5=BA=94?= =?UTF-8?q?mapper=E5=87=BD=E6=95=B0=E5=B0=91=E5=8F=82=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=20*=20fi?= =?UTF-8?q?x:=20`job=5Fsummary`=E8=A1=A8=E7=BC=BA`system=5Ftask=5Ftype`?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/easy_retry_mysql.sql | 35 ++++---- .../persistence/mapper/JobSummaryMapper.java | 6 +- .../mapper/RetrySummaryMapper.java | 2 +- .../mysql/mapper/JobLogMessageMapper.xml | 46 +++++----- .../main/resources/mysql/mapper/JobMapper.xml | 21 +++-- .../mysql/mapper/JobSummaryMapper.xml | 83 ++++++++--------- .../mysql/mapper/RetryDeadLetterMapper.xml | 27 ++++-- .../mysql/mapper/RetrySummaryMapper.xml | 90 ++++++++++--------- .../mysql/mapper/RetryTaskLogMapper.xml | 5 +- .../mapper/RetryTaskLogMessageMapper.xml | 45 +++++----- .../mysql/mapper/RetryTaskMapper.xml | 21 +++-- .../mysql/mapper/ServerNodeMapper.xml | 36 +++++--- .../resources/mysql/mapper/WorkflowMapper.xml | 23 +++-- .../service/impl/DashBoardServiceImpl.java | 9 +- 14 files changed, 236 insertions(+), 213 deletions(-) diff --git a/doc/sql/easy_retry_mysql.sql b/doc/sql/easy_retry_mysql.sql index 635803658..d9179e916 100644 --- a/doc/sql/easy_retry_mysql.sql +++ b/doc/sql/easy_retry_mysql.sql @@ -159,8 +159,8 @@ CREATE TABLE `retry_task_log_message` `unique_id` varchar(64) NOT NULL COMMENT '同组下id唯一', `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `message` text NOT NULL COMMENT '异常信息', - `log_num` int(11) NOT NULL DEFAULT 1 COMMENT '日志数量', - `real_time` bigint(13) NOT NULL DEFAULT 0 COMMENT '上报时间', + `log_num` int(11) NOT NULL DEFAULT 1 COMMENT '日志数量', + `real_time` bigint(13) NOT NULL DEFAULT 0 COMMENT '上报时间', `client_info` varchar(128) DEFAULT NULL COMMENT '客户端地址 clientId#ip:port', PRIMARY KEY (`id`), KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `unique_id`), @@ -380,7 +380,7 @@ CREATE TABLE `job_task_batch` KEY `idx_job_id_task_batch_status` (`job_id`, `task_batch_status`), KEY `idx_create_dt` (`create_dt`), KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`), - KEY `idx_workflow_task_batch_id_workflow_node_id` (`workflow_task_batch_id`,`workflow_node_id`) + KEY `idx_workflow_task_batch_id_workflow_node_id` (`workflow_task_batch_id`, `workflow_node_id`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='任务批次'; @@ -409,20 +409,21 @@ CREATE TABLE `job_notify_config` CREATE TABLE `job_summary` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` VARCHAR(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '组名称', - `business_id` bigint NOT NULL COMMENT '业务id (job_id或workflow_id)', - `trigger_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '统计时间', - `success_num` int NOT NULL DEFAULT '0' COMMENT '执行成功-日志数量', - `fail_num` int NOT NULL DEFAULT '0' COMMENT '执行失败-日志数量', - `fail_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '失败原因', - `stop_num` int NOT NULL DEFAULT '0' COMMENT '执行失败-日志数量', - `stop_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '失败原因', - `cancel_num` int NOT NULL DEFAULT '0' COMMENT '执行失败-日志数量', - `cancel_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '失败原因', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', + `namespace_id` VARCHAR(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', + `group_name` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '组名称', + `business_id` bigint NOT NULL COMMENT '业务id (job_id或workflow_id)', + `system_task_type` tinyint(4) NOT NULL DEFAULT '3' COMMENT '任务类型 3、JOB任务 4、WORKFLOW任务', + `trigger_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '统计时间', + `success_num` int NOT NULL DEFAULT '0' COMMENT '执行成功-日志数量', + `fail_num` int NOT NULL DEFAULT '0' COMMENT '执行失败-日志数量', + `fail_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '失败原因', + `stop_num` int NOT NULL DEFAULT '0' COMMENT '执行失败-日志数量', + `stop_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '失败原因', + `cancel_num` int NOT NULL DEFAULT '0' COMMENT '执行失败-日志数量', + `cancel_reason` varchar(512) NOT NULL DEFAULT '' COMMENT '失败原因', + `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), KEY `idx_namespace_id_group_name_business_id` (`namespace_id`, `group_name`, business_id), UNIQUE KEY `uk_business_id_trigger_at` (`business_id`, `trigger_at`) USING BTREE diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java index b0839bf98..affbddf1c 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobSummaryMapper.java @@ -4,7 +4,6 @@ import com.aizuda.easy.retry.template.datasource.persistence.dataobject.Dashboar import com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardLineResponseDO; import com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO; import com.aizuda.easy.retry.template.datasource.persistence.po.Job; -import com.aizuda.easy.retry.template.datasource.persistence.po.JobNotifyConfig; import com.aizuda.easy.retry.template.datasource.persistence.po.JobSummary; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -13,7 +12,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.time.LocalDateTime; import java.util.List; /** @@ -28,9 +26,9 @@ public interface JobSummaryMapper extends BaseMapper { IPage jobTaskList(@Param("ew") Wrapper wrapper, Page page); - List jobLineList(@Param("ew") Wrapper wrapper); + List jobLineList(String dateFormat, @Param("ew") Wrapper wrapper); - List dashboardRank(@Param("ew") Wrapper wrapper); + List dashboardRank(Integer systemTaskType, @Param("ew") Wrapper wrapper); DashboardCardResponseDO.JobTask toJobTask(@Param("ew") Wrapper wrapper); } diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java index 7d0c13b2c..531a7e401 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/RetrySummaryMapper.java @@ -32,7 +32,7 @@ public interface RetrySummaryMapper extends BaseMapper { IPage retryTaskList(@Param("ew") Wrapper wrapper, Page page); - List retryLineList(@Param("ew") Wrapper wrapper); + List retryLineList(String type, @Param("ew") Wrapper wrapper); List dashboardRank(@Param("ew") Wrapper wrapper); } diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobLogMessageMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobLogMessageMapper.xml index 11f0b99a0..61363a6fc 100644 --- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobLogMessageMapper.xml +++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobLogMessageMapper.xml @@ -19,30 +19,30 @@ INSERT INTO job_log_message - ( - namespace_id, - group_name, - job_id, - task_batch_id, - task_id, - log_num, - message, - create_dt, - real_time - ) - VALUES - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.jobId}, - #{item.taskBatchId}, - #{item.taskId}, - #{item.logNum}, - #{item.message}, - #{item.createDt}, - #{item.realTime} + namespace_id, + group_name, + job_id, + task_batch_id, + task_id, + log_num, + message, + create_dt, + real_time ) - + VALUES + + ( + #{item.namespaceId}, + #{item.groupName}, + #{item.jobId}, + #{item.taskBatchId}, + #{item.taskId}, + #{item.logNum}, + #{item.message}, + #{item.createDt}, + #{item.realTime} + ) + diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobMapper.xml index de263ea08..518a0c239 100644 --- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobMapper.xml +++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobMapper.xml @@ -27,17 +27,16 @@ - update job rt, - ( - - select - #{item.nextTriggerAt} as next_trigger_at, - #{item.id} as id - - ) tt - set - rt.next_trigger_at = tt.next_trigger_at - where rt.id = tt.id + UPDATE job rt, + ( + + SELECT + #{item.nextTriggerAt} AS next_trigger_at, + #{item.id} AS id + + ) tt + SET rt.next_trigger_at = tt.next_trigger_at + WHERE rt.id = tt.id diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml index f17fdff31..5fd845e28 100644 --- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml +++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml @@ -20,45 +20,44 @@ - INSERT INTO - job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type, - success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) + INSERT INTO job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type, + success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.businessId}, - #{item.triggerAt}, - #{item.systemTaskType}, - #{item.successNum}, - #{item.failNum}, - #{item.failReason}, - #{item.stopNum}, - #{item.stopReason}, - #{item.cancelNum}, - #{item.cancelReason} - ) - + + ( + #{item.namespaceId}, + #{item.groupName}, + #{item.businessId}, + #{item.triggerAt}, + #{item.systemTaskType}, + #{item.successNum}, + #{item.failNum}, + #{item.failReason}, + #{item.stopNum}, + #{item.stopReason}, + #{item.cancelNum}, + #{item.cancelReason} + ) + ON DUPLICATE KEY UPDATE - success_num = values(`success_num`), - fail_num = values(`fail_num`), - fail_reason = values(`fail_reason`), - stop_num = values(`stop_num`), - stop_reason = values(`stop_reason`), - cancel_num = values(`cancel_num`), - cancel_reason = values(`cancel_reason`) + success_num = VALUES(`success_num`), + fail_num = VALUES(`fail_num`), + fail_reason = VALUES(`fail_reason`), + stop_num = VALUES(`stop_num`), + stop_reason = VALUES(`stop_reason`), + cancel_num = VALUES(`cancel_num`), + cancel_reason = VALUES(`cancel_reason`) SELECT - ifnull(sum(success_num), 0) AS successNum, - ifnull(sum(stop_num), 0) AS stopNum, - ifnull(sum(cancel_num), 0) AS cancelNum, - ifnull(sum(fail_num), 0) AS failNum, - ifnull(sum(success_num + fail_num + stop_num + cancel_num), 0) AS totalNum + IFNULL(SUM(success_num), 0) AS successNum, + IFNULL(SUM(stop_num), 0) AS stopNum, + IFNULL(SUM(cancel_num), 0) AS cancelNum, + IFNULL(SUM(fail_num), 0) AS failNum, + IFNULL(SUM(success_num + fail_num + stop_num + cancel_num), 0) AS totalNum FROM job_summary ${ew.customSqlSegment} @@ -83,19 +82,21 @@ CONCAT(group_name, '/', (SELECT job_name FROM job WHERE id = business_id)) name, - CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) name, + CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) name, - SUM(fail_num) AS total FROM job_summary + SUM(fail_num) AS total + FROM job_summary ${ew.customSqlSegment} HAVING total > 0 - ORDER BY total DESC LIMIT 10 + ORDER BY total DESC + LIMIT 10 - SELECT - IFNULL(SUM(running_num), 0) AS runningNum, - IFNULL(SUM(finish_num), 0) AS finishNum, - IFNULL(SUM(max_count_num), 0) AS maxCountNum, - IFNULL(SUM(suspend_num), 0) AS suspendNum, - IFNULL(SUM(running_num + finish_num + max_count_num + suspend_num), 0) AS totalNum + SELECT IFNULL(SUM(running_num), 0) AS runningNum, + IFNULL(SUM(finish_num), 0) AS finishNum, + IFNULL(SUM(max_count_num), 0) AS maxCountNum, + IFNULL(SUM(suspend_num), 0) AS suspendNum, + IFNULL(SUM(running_num + finish_num + max_count_num + suspend_num), 0) AS totalNum FROM retry_summary ${ew.customSqlSegment} SELECT - - - DATE_FORMAT(create_dt,'%H') - - - DATE_FORMAT(create_dt,'%Y-%m-%d') - - - DATE_FORMAT(create_dt,'%Y-%m-%d') - - - DATE_FORMAT(create_dt,'%Y-%m') - - - DATE_FORMAT(create_dt,'%Y-%m-%d') - - - AS createDt, - IFNULL(SUM(finish_num), 0) AS successNum, - IFNULL(SUM(running_num), 0) AS runningNum, - IFNULL(SUM(max_count_num), 0) AS maxCountNum, - IFNULL(SUM(suspend_num), 0) AS suspendNum, - IFNULL(SUM(finish_num + running_num + max_count_num + suspend_num), 0) AS total + + + DATE_FORMAT(create_dt,'%H') + + + DATE_FORMAT(create_dt,'%Y-%m-%d') + + + DATE_FORMAT(create_dt,'%Y-%m-%d') + + + DATE_FORMAT(create_dt,'%Y-%m') + + + DATE_FORMAT(create_dt,'%Y-%m-%d') + + + AS createDt, + IFNULL(SUM(finish_num), 0) AS successNum, + IFNULL(SUM(running_num), 0) AS runningNum, + IFNULL(SUM(max_count_num), 0) AS maxCountNum, + IFNULL(SUM(suspend_num), 0) AS suspendNum, + IFNULL(SUM(finish_num + running_num + max_count_num + suspend_num), 0) AS total FROM retry_summary ${ew.customSqlSegment} GROUP BY createDt @@ -93,20 +95,20 @@ - SELECT node_type as nodeType, count(*) as total - from server_node + SELECT + node_type AS nodeType, + COUNT(*) AS total + FROM server_node ${ew.customSqlSegment} diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/WorkflowMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/WorkflowMapper.xml index d957fb80a..23aad000e 100644 --- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/WorkflowMapper.xml +++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/WorkflowMapper.xml @@ -15,19 +15,18 @@ + - update workflow rt, - ( - - select - #{item.nextTriggerAt} as next_trigger_at, - #{item.id} as id - - ) tt - set - rt.next_trigger_at = tt.next_trigger_at - where rt.id = tt.id + UPDATE workflow rt, + ( + + SELECT + #{item.nextTriggerAt} AS next_trigger_at, + #{item.id} AS id + + ) tt + SET rt.next_trigger_at = tt.next_trigger_at + WHERE rt.id = tt.id - diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java index ca2ce6cd0..e06053062 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/DashBoardServiceImpl.java @@ -9,6 +9,7 @@ import com.aizuda.easy.retry.common.core.util.NetUtil; import com.aizuda.easy.retry.common.log.EasyRetryLog; import com.aizuda.easy.retry.server.common.dto.DistributeInstance; import com.aizuda.easy.retry.server.common.dto.ServerNodeExtAttrs; +import com.aizuda.easy.retry.server.common.enums.DashboardLineEnum; import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum; import com.aizuda.easy.retry.server.common.enums.SystemModeEnum; import com.aizuda.easy.retry.server.common.register.ServerRegister; @@ -164,10 +165,10 @@ public class DashBoardServiceImpl implements DashBoardService { LocalDateTime endDateTime = dateTypeEnum.getEndTime().apply(StrUtil.isNotBlank(endTime) ? LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : null); LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper() .in(CollUtil.isNotEmpty(groupNames), RetrySummary::getGroupName, groupNames) - .eq(StrUtil.isNotBlank(groupName), RetrySummary::getGroupName, groupNames) + .eq(StrUtil.isNotBlank(groupName), RetrySummary::getGroupName, groupName) .eq(RetrySummary::getNamespaceId, namespaceId) .between(RetrySummary::getTriggerAt, startDateTime, endDateTime); - List dashboardRetryLinkeResponseDOList = retrySummaryMapper.retryLineList(wrapper1); + List dashboardRetryLinkeResponseDOList = retrySummaryMapper.retryLineList(type, wrapper1); List dashboardLineResponseVOList = DispatchQuantityResponseVOConverter.INSTANCE.toDashboardLineResponseVO(dashboardRetryLinkeResponseDOList); dateTypeEnum.getConsumer().accept(dashboardLineResponseVOList); dashboardLineResponseVOList.sort(Comparator.comparing(a -> a.getCreateDt())); @@ -221,7 +222,7 @@ public class DashBoardServiceImpl implements DashBoardService { .eq(JobSummary::getSystemTaskType, systemTaskType) .eq(JobSummary::getNamespaceId, namespaceId) .between(JobSummary::getTriggerAt, startDateTime, endDateTime); - List dashboardLineResponseDOList = jobSummaryMapper.jobLineList(queryWrapper); + List dashboardLineResponseDOList = jobSummaryMapper.jobLineList(DashboardLineEnum.modeOf(type).getDateFormat(), queryWrapper); List dashboardLineResponseVOList = DispatchQuantityResponseVOConverter.INSTANCE.toDashboardLineResponseVO(dashboardLineResponseDOList); dateTypeEnum.getConsumer().accept(dashboardLineResponseVOList); dashboardLineResponseVOList.sort(Comparator.comparing(a -> a.getCreateDt())); @@ -235,7 +236,7 @@ public class DashBoardServiceImpl implements DashBoardService { .eq(JobSummary::getSystemTaskType, systemTaskType) .eq(JobSummary::getNamespaceId, namespaceId) .groupBy(JobSummary::getNamespaceId, JobSummary::getGroupName, JobSummary::getBusinessId); - List rankList = jobSummaryMapper.dashboardRank(wrapper); + List rankList = jobSummaryMapper.dashboardRank(systemTaskType, wrapper); List ranks = SceneQuantityRankResponseVOConverter.INSTANCE.toDashboardRetryLineResponseVORank(rankList); dashboardRetryLineResponseVO.setRankList(ranks); return dashboardRetryLineResponseVO;