From 519dc776f33cc733b3d97128e87f44d0e3737861 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Sun, 31 Mar 2024 17:30:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20JobSummary=20UK=20=E5=8A=A0=E4=B8=8Asyst?= =?UTF-8?q?emTaskType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/easy_retry_mysql.sql | 2 +- doc/sql/easy_retry_oracle.sql | 2 +- doc/sql/easy_retry_postgre.sql | 2 +- doc/sql/easy_retry_sqlserver.sql | 2 +- .../job/task/support/schedule/JobSummarySchedule.java | 1 + .../support/schedule/WorkflowJobSummarySchedule.java | 10 ++++------ 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/doc/sql/easy_retry_mysql.sql b/doc/sql/easy_retry_mysql.sql index ec59e8c3..287d0524 100644 --- a/doc/sql/easy_retry_mysql.sql +++ b/doc/sql/easy_retry_mysql.sql @@ -428,7 +428,7 @@ CREATE TABLE `job_summary` PRIMARY KEY (`id`), KEY `idx_trigger_at` (`trigger_at`), 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 + UNIQUE KEY `uk_system_task_type_business_id_trigger_at` (`system_task_type`, `business_id`, `trigger_at`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET = utf8mb4 COMMENT ='DashBoard_Job'; diff --git a/doc/sql/easy_retry_oracle.sql b/doc/sql/easy_retry_oracle.sql index 20f95865..9365a7d8 100644 --- a/doc/sql/easy_retry_oracle.sql +++ b/doc/sql/easy_retry_oracle.sql @@ -678,7 +678,7 @@ CREATE TABLE job_summary update_dt TIMESTAMP DEFAULT CURRENT_TIMESTAMP ); -CREATE UNIQUE INDEX uk_job_summary_1 ON job_summary (business_id, trigger_at); +CREATE UNIQUE INDEX uk_job_summary_1 ON job_summary (system_task_type, business_id, trigger_at); CREATE INDEX idx_job_summary_1 ON job_summary (namespace_id, group_name, business_id); COMMENT ON TABLE job_summary IS 'DashBoard_Job'; diff --git a/doc/sql/easy_retry_postgre.sql b/doc/sql/easy_retry_postgre.sql index ebd259e8..d9797f14 100644 --- a/doc/sql/easy_retry_postgre.sql +++ b/doc/sql/easy_retry_postgre.sql @@ -660,7 +660,7 @@ CREATE TABLE job_summary update_dt TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ); -CREATE UNIQUE INDEX uk_job_id_trigger_at ON job_summary (business_id, trigger_at); +CREATE UNIQUE INDEX uk_system_task_type_business_id_trigger_at ON job_summary (system_task_type, business_id, trigger_at); CREATE INDEX idx_namespace_id_group_name_job_id ON job_summary (namespace_id, group_name, business_id); COMMENT ON COLUMN job_summary.id IS '主键'; diff --git a/doc/sql/easy_retry_sqlserver.sql b/doc/sql/easy_retry_sqlserver.sql index 2da61880..793969ba 100644 --- a/doc/sql/easy_retry_sqlserver.sql +++ b/doc/sql/easy_retry_sqlserver.sql @@ -673,7 +673,7 @@ CREATE TABLE job_summary ) GO -CREATE UNIQUE NONCLUSTERED INDEX uk_job_id_trigger_at ON job_summary (business_id ASC, trigger_at ASC) +CREATE UNIQUE NONCLUSTERED INDEX uk_system_task_type_business_id_trigger_at ON job_summary (system_task_type ASC, business_id ASC, trigger_at ASC) GO CREATE NONCLUSTERED INDEX idx_namespace_id_group_name_job_id ON job_summary (namespace_id ASC, group_name ASC, business_id ASC) GO diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java index a0f2e383..b4dc8a4c 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobSummarySchedule.java @@ -87,6 +87,7 @@ public class JobSummarySchedule extends AbstractSchedule implements Lifecycle { List jobSummaries = jobSummaryMapper.selectList(new LambdaQueryWrapper() .eq(JobSummary::getTriggerAt, todayFrom) + .eq(JobSummary::getSystemTaskType, SyetemTaskTypeEnum.JOB.getType()) .in(JobSummary::getBusinessId, jobSummaryList.stream().map(JobSummary::getBusinessId).collect( Collectors.toSet()))); diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/WorkflowJobSummarySchedule.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/WorkflowJobSummarySchedule.java index 904d705f..7e0aec74 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/WorkflowJobSummarySchedule.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/WorkflowJobSummarySchedule.java @@ -13,11 +13,9 @@ import com.aizuda.easy.retry.template.datasource.persistence.dataobject.JobBatch import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobSummaryMapper; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskBatchMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.JobSummary; -import com.aizuda.easy.retry.template.datasource.persistence.po.JobTaskBatch; import com.aizuda.easy.retry.template.datasource.persistence.po.WorkflowTaskBatch; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -31,7 +29,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; import java.util.stream.Collectors; /** @@ -91,6 +88,7 @@ public class WorkflowJobSummarySchedule extends AbstractSchedule implements Life List jobSummaries = jobSummaryMapper.selectList(new LambdaQueryWrapper() .eq(JobSummary::getTriggerAt, todayFrom) + .eq(JobSummary::getSystemTaskType, SyetemTaskTypeEnum.WORKFLOW.getType()) .in(JobSummary::getBusinessId, jobSummaryList.stream().map(JobSummary::getBusinessId).collect( Collectors.toSet()))); @@ -130,7 +128,7 @@ public class WorkflowJobSummarySchedule extends AbstractSchedule implements Life } private List jobSummaryList(LocalDateTime triggerAt, - List summaryResponseDOList) { + List summaryResponseDOList) { List jobSummaryList = new ArrayList<>(); Map> jobIdListMap = summaryResponseDOList.parallelStream() .collect(Collectors.groupingBy(JobBatchSummaryResponseDO::getJobId)); @@ -165,7 +163,7 @@ public class WorkflowJobSummarySchedule extends AbstractSchedule implements Life * @return */ private List jobTaskBatchReasonList(int jobTaskBatchStatus, - List jobBatchSummaryResponseDOList) { + List jobBatchSummaryResponseDOList) { List jobTaskBatchReasonArrayList = new ArrayList<>(); List summaryResponseDOList = jobBatchSummaryResponseDOList.stream() .filter(i -> jobTaskBatchStatus == i.getTaskBatchStatus()).collect(Collectors.toList()); @@ -180,7 +178,7 @@ public class WorkflowJobSummarySchedule extends AbstractSchedule implements Life @Override public void start() { - taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1H")); + taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1M")); } @Override