From b328aafbe7ac493f247b7b08df5d3eef93e3cbaa Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Sun, 3 Dec 2023 17:56:51 +0800 Subject: [PATCH] =?UTF-8?q?refactor:2.5.0=201.=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81=E4=B8=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=97=B6=E5=8F=91=E7=94=9F=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=202.=20=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AFjs=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/dispatch/JobExecutorActor.java | 6 ++-- .../support/handler/JobTaskBatchHandler.java | 9 +++--- .../actor/scan/AbstractScanGroup.java | 4 +-- frontend/src/api/jobApi.js | 6 ++-- frontend/src/utils/jobEnum.js | 8 +++-- frontend/src/utils/permissionsConfig.js | 2 +- frontend/src/views/job/JobNotifyList.vue | 32 +++++++++---------- frontend/src/views/job/form/JobNotifyForm.vue | 21 ++++++------ 8 files changed, 42 insertions(+), 46 deletions(-) diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorActor.java index 705920729..5f1dc3e60 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorActor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorActor.java @@ -2,6 +2,7 @@ package com.aizuda.easy.retry.server.job.task.support.dispatch; import akka.actor.AbstractActor; import cn.hutool.core.lang.Assert; +import com.aizuda.easy.retry.common.core.context.SpringContext; import com.aizuda.easy.retry.common.core.enums.JobOperationReasonEnum; import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum; import com.aizuda.easy.retry.common.core.enums.StatusEnum; @@ -23,7 +24,6 @@ import com.aizuda.easy.retry.server.job.task.support.executor.JobExecutorContext import com.aizuda.easy.retry.server.job.task.support.executor.JobExecutorFactory; import com.aizuda.easy.retry.server.job.task.support.timer.JobTimerWheel; import com.aizuda.easy.retry.server.job.task.support.timer.ResidentJobTimerTask; -import com.aizuda.easy.retry.server.retry.task.support.event.RetryTaskFailMoreThresholdAlarmEvent; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobMapper; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskBatchMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.Job; @@ -61,8 +61,6 @@ public class JobExecutorActor extends AbstractActor { private JobTaskBatchMapper jobTaskBatchMapper; @Autowired private TransactionTemplate transactionTemplate; - @Autowired - private ApplicationContext context; @Override public Receive createReceive() { @@ -79,7 +77,7 @@ public class JobExecutorActor extends AbstractActor { } catch (Exception e) { LogUtils.error(log, "job executor exception. [{}]", taskExecute, e); handlerTaskBatch(taskExecute, JobTaskBatchStatusEnum.FAIL.getStatus(), JobOperationReasonEnum.TASK_EXECUTE_ERROR.getReason()); - context.publishEvent(new JobTaskFailAlarmEvent(taskExecute.getTaskBatchId())); + SpringContext.CONTEXT.publishEvent(new JobTaskFailAlarmEvent(taskExecute.getTaskBatchId())); } finally { getContext().stop(getSelf()); } diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/handler/JobTaskBatchHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/handler/JobTaskBatchHandler.java index 84e935d14..36297b77b 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/handler/JobTaskBatchHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/handler/JobTaskBatchHandler.java @@ -1,12 +1,10 @@ package com.aizuda.easy.retry.server.job.task.support.handler; +import com.aizuda.easy.retry.common.core.context.SpringContext; import com.aizuda.easy.retry.common.core.enums.JobOperationReasonEnum; import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum; import com.aizuda.easy.retry.common.core.enums.JobTaskStatusEnum; -import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; -import com.aizuda.easy.retry.server.job.task.support.JobTaskStopHandler; -import com.aizuda.easy.retry.server.job.task.support.stop.JobTaskStopFactory; -import com.aizuda.easy.retry.server.job.task.support.stop.TaskStopJobContext; +import com.aizuda.easy.retry.server.job.task.support.event.JobTaskFailAlarmEvent; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskBatchMapper; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; @@ -51,7 +49,7 @@ public class JobTaskBatchHandler { new LambdaUpdateWrapper() .eq(JobTaskBatch::getId, taskBatchId) .in(JobTaskBatch::getTaskBatchStatus, JobTaskStatusEnum.NOT_COMPLETE)); - + SpringContext.CONTEXT.publishEvent(new JobTaskFailAlarmEvent(taskBatchId)); return false; } @@ -67,6 +65,7 @@ public class JobTaskBatchHandler { if (failCount > 0) { jobTaskBatch.setTaskBatchStatus(JobTaskBatchStatusEnum.FAIL.getStatus()); + SpringContext.CONTEXT.publishEvent(new JobTaskFailAlarmEvent(taskBatchId)); } else if (stopCount > 0) { jobTaskBatch.setTaskBatchStatus(JobTaskBatchStatusEnum.STOP.getStatus()); } else { diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/scan/AbstractScanGroup.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/scan/AbstractScanGroup.java index 5d00d5ff3..fdd873ec7 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/scan/AbstractScanGroup.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/scan/AbstractScanGroup.java @@ -109,8 +109,8 @@ public abstract class AbstractScanGroup extends AbstractActor { return false; }, lastId); - log.warn(this.getClass().getName() + " retry scan end. groupName:[{}] startId:[{}] preCostTime:[{}] total:[{}] realPullCount:[{}]", - groupName, lastId, preCostTime().get(), total, count.get()); +// log.warn(this.getClass().getName() + " retry scan end. groupName:[{}] startId:[{}] preCostTime:[{}] total:[{}] realPullCount:[{}]", +// groupName, lastId, preCostTime().get(), total, count.get()); } diff --git a/frontend/src/api/jobApi.js b/frontend/src/api/jobApi.js index abdc52739..ebf5a6a33 100644 --- a/frontend/src/api/jobApi.js +++ b/frontend/src/api/jobApi.js @@ -1,5 +1,4 @@ import request from '@/utils/request' -import retryApi from "@/api/retryApi"; const jobApi = { // 任务信息 jobPageList: '/job/page/list', @@ -18,13 +17,12 @@ const jobApi = { jobBatchDetail: '/job/batch/', stop: '/job/batch/stop/', - //通知 + // 通知 jobNotifyConfigPageList: '/job/notify/config/page/list', jobNotifyConfigDetail: '/job/notify/config/', saveJobNotify: '/job/notify/config/', updateJobNotify: '/job/notify/config/', - // 任务 jobTaskList: '/job/task/list', @@ -177,4 +175,4 @@ export function updateJobNotify (data) { method: 'put', data }) -} \ No newline at end of file +} diff --git a/frontend/src/utils/jobEnum.js b/frontend/src/utils/jobEnum.js index ae9af4c7f..54e62b25e 100644 --- a/frontend/src/utils/jobEnum.js +++ b/frontend/src/utils/jobEnum.js @@ -171,7 +171,8 @@ const enums = { 'name': '飞书', 'color': '#087da1' } - }, notifyStatus: { + }, +notifyStatus: { '0': { 'name': '停用', 'color': '#9c1f1f' @@ -180,7 +181,8 @@ const enums = { 'name': '启用', 'color': '#f5a22d' } - }, rateLimiterStatus: { + }, +rateLimiterStatus: { '0': { 'name': '未启用', 'color': '#9c1f1f' @@ -189,7 +191,7 @@ const enums = { 'name': '启用', 'color': '#f5a22d' } - }, + } } module.exports = enums diff --git a/frontend/src/utils/permissionsConfig.js b/frontend/src/utils/permissionsConfig.js index 5d7cde208..f35d85af2 100644 --- a/frontend/src/utils/permissionsConfig.js +++ b/frontend/src/utils/permissionsConfig.js @@ -111,7 +111,7 @@ const jobAdmin = [ roleId: 1, permissionId: 'jobBatch', permissionName: '任务批次' - },{ + }, { roleId: 1, permissionId: 'jobNotify', permissionName: '任务通知' diff --git a/frontend/src/views/job/JobNotifyList.vue b/frontend/src/views/job/JobNotifyList.vue index 895b8a583..7642084d1 100644 --- a/frontend/src/views/job/JobNotifyList.vue +++ b/frontend/src/views/job/JobNotifyList.vue @@ -28,7 +28,7 @@ @search="handleSearch" > - {{item.jobName}} + {{ item.jobName }} @@ -38,17 +38,17 @@ - - 查询 - 重置 - - {{ advanced ? '收起' : '展开' }} - - - + + 查询 + 重置 + + {{ advanced ? '收起' : '展开' }} + + + @@ -99,9 +99,9 @@ diff --git a/frontend/src/views/job/form/JobNotifyForm.vue b/frontend/src/views/job/form/JobNotifyForm.vue index 27c5b41b1..3f568a470 100644 --- a/frontend/src/views/job/form/JobNotifyForm.vue +++ b/frontend/src/views/job/form/JobNotifyForm.vue @@ -56,15 +56,15 @@ - + {{ item }} - - {{item.jobName}} + + {{ item.jobName }} @@ -103,21 +103,21 @@ - + {{ item.name }} - - + +