From 1e3ff026054cd62bb35065842eed5a2fd988300c Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Thu, 12 Oct 2023 18:15:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=202.4.0=201.=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/easy_retry_mysql.sql | 4 +- .../mapper/JobTaskBatchMapper.java | 1 - .../datasource/persistence/po/Job.java | 2 +- .../datasource/persistence/po/JobTask.java | 2 +- .../mysql/mapper/JobTaskBatchMapper.xml | 18 ---- .../common/cache/CacheRegisterTable.java | 4 +- ...asyRetryServerCommonAutoConfiguration.java | 1 + .../generator/id/SegmentIdGenerator.java | 3 - .../server/job/EasyRetryJobTaskStarter.java | 28 ----- .../retry/server/job/task/BlockStrategy.java | 11 -- ...tion.java => EasyRetryJobTaskStarter.java} | 11 +- .../job/task/support/BlockStrategy.java | 11 ++ .../ClientCallbackHandler.java | 3 +- .../executor => support}/JobExecutor.java | 3 +- .../JobPrePareHandler.java | 2 +- .../task/{ => support}/JobTaskConverter.java | 14 +-- .../stop => support}/JobTaskStopHandler.java | 3 +- .../job/task/{ => support}/WaitStrategy.java | 4 +- .../AbstractClientCallbackHandler.java | 3 +- .../BroadcastClientCallbackHandler.java | 6 +- .../callback/ClientCallbackContext.java | 2 +- .../callback/ClientCallbackFactory.java | 3 +- .../ClusterClientCallbackHandler.java | 4 +- .../ShardingClientCallbackHandler.java | 6 +- .../dispatch/JobExecutorActor.java | 8 +- .../dispatch/JobExecutorResultActor.java | 26 +---- .../{ => support}/dispatch/JobLogActor.java | 4 +- .../dispatch/JobTaskPrepareActor.java | 6 +- .../dispatch/ScanJobTaskActor.java | 16 +-- .../executor/AbstractJobExecutor.java | 11 +- .../executor/BroadcastTaskJobExecutor.java | 4 +- .../executor/ClusterJobExecutor.java | 4 +- .../executor/JobExecutorContext.java | 2 +- .../executor/JobExecutorFactory.java | 3 +- .../executor/RealJobExecutorActor.java | 4 +- .../executor/ShardingJobExecutor.java | 4 +- .../batch/JobTaskBatchGenerator.java | 6 +- .../batch/JobTaskBatchGeneratorContext.java | 2 +- .../task/AbstractJobTaskGenerator.java | 2 +- .../task/BroadcastTaskGenerator.java | 4 +- .../generator/task/ClusterTaskGenerator.java | 4 +- .../task/JobTaskGenerateContext.java | 2 +- .../generator/task/JobTaskGenerator.java | 2 +- .../task/JobTaskGeneratorFactory.java | 2 +- .../generator/task/ShardingTaskGenerator.java | 4 +- .../handler/JobTaskBatchHandler.java} | 4 +- .../prepare/AbstractJobPrePareHandler.java | 3 +- .../prepare/RunningJobPrepareHandler.java | 21 ++-- .../prepare/TerminalJobPrepareHandler.java | 6 +- .../prepare/WaitJobPrepareHandler.java | 6 +- ...tDispatchResultPostHttpRequestHandler.java | 10 +- .../stop/AbstractJobTaskStopHandler.java | 5 +- .../stop/BroadcastTaskStopHandler.java | 7 +- .../stop/ClusterTaskStopHandler.java | 11 +- .../stop/JobTaskStopFactory.java | 3 +- .../stop/RealStopTaskActor.java | 2 +- .../stop/ShardingTaskStopHandler.java | 4 +- .../stop/TaskStopJobContext.java | 2 +- .../strategy/BlockStrategies.java | 16 +-- .../strategy/WaitStrategies.java | 10 +- .../timer/JobTimerTask.java | 7 +- .../timer/JobTimerWheelHandler.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- ...on.java => EasyRetryRetryTaskStarter.java} | 9 +- .../dispatch/actor/result/FailureActor.java | 14 +-- .../actor/scan/AbstractScanGroup.java | 16 +-- .../actor/scan/ScanCallbackTaskActor.java | 16 +-- .../actor/scan/ScanRetryTaskActor.java | 20 +--- ...ctuator.java => AbstractTaskExecutor.java} | 6 +- ...ctuator.java => CallbackTaskExecutor.java} | 7 +- ...r.java => ManualCallbackTaskExecutor.java} | 6 +- ...ator.java => ManualRetryTaskExecutor.java} | 6 +- ...skActuator.java => RetryTaskExecutor.java} | 7 +- .../dispatch/task/TaskActuatorFactory.java | 10 +- .../{TaskActuator.java => TaskExecutor.java} | 5 +- ...neEnum.java => TaskExecutorSceneEnum.java} | 2 +- .../actor => timer}/AbstractTimerTask.java | 2 +- .../actor => timer}/CallbackTimerTask.java | 2 +- .../actor => timer}/RetryTimerContext.java | 6 +- .../actor => timer}/RetryTimerTask.java | 13 +-- .../actor => timer}/TimerWheelHandler.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- .../server/dispatch/DispatchService.java | 2 +- ...guration.java => EasyRetryWebStarter.java} | 9 +- .../web/controller/JobBatchController.java | 43 ++++++++ .../server/web/controller/JobController.java | 15 ++- .../web/controller/JobLogController.java | 33 ++++++ .../web/controller/JobTaskController.java | 33 ++++++ .../web/model/request/JobBatchQueryVO.java | 16 +++ .../web/model/request/JobLogQueryVO.java | 17 +++ .../server/web/model/request/JobQueryVO.java | 6 ++ .../web/model/request/JobRequestVO.java | 102 ++++++++++++++++++ .../web/model/request/JobTaskQueryVO.java | 17 +++ .../model/response/JobBatchResponseVO.java | 13 +++ .../web/model/response/JobLogResponseVO.java | 52 +++++++++ .../web/model/response/JobTaskResponseVO.java | 83 ++++++++++++++ .../server/web/service/JobBatchService.java | 19 ++++ .../server/web/service/JobLogService.java | 17 +++ .../retry/server/web/service/JobService.java | 6 +- .../server/web/service/JobTaskService.java | 17 +++ .../convert/JobBatchResponseVOConverter.java | 23 ++++ .../web/service/convert/JobConverter.java | 20 ++++ .../convert/JobLogResponseVOConverter.java | 21 ++++ .../convert/JobResponseVOConverter.java | 2 + .../convert/JobTaskResponseVOConverter.java | 21 ++++ .../web/service/impl/JobBatchServiceImpl.java | 52 +++++++++ .../web/service/impl/JobLogServiceImpl.java | 39 +++++++ .../web/service/impl/JobServiceImpl.java | 31 ++++-- .../web/service/impl/JobTaskServiceImpl.java | 50 +++++++++ .../service/impl/RetryTaskServiceImpl.java | 32 ++---- .../main/resources/META-INF/spring.factories | 2 +- 111 files changed, 952 insertions(+), 382 deletions(-) delete mode 100644 easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/EasyRetryJobTaskStarter.java delete mode 100644 easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/BlockStrategy.java rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{config/EasyRetryServerRetryJobAutoConfiguration.java => EasyRetryJobTaskStarter.java} (52%) create mode 100644 easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/BlockStrategy.java rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler/callback => support}/ClientCallbackHandler.java (66%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler/executor => support}/JobExecutor.java (66%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler/prepare => support}/JobPrePareHandler.java (81%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/JobTaskConverter.java (84%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler/stop => support}/JobTaskStopHandler.java (66%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/WaitStrategy.java (76%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/callback/AbstractClientCallbackHandler.java (82%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/callback/BroadcastClientCallbackHandler.java (88%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/callback/ClientCallbackContext.java (86%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/callback/ClientCallbackFactory.java (82%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/callback/ClusterClientCallbackHandler.java (90%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/callback/ShardingClientCallbackHandler.java (88%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/dispatch/JobExecutorActor.java (88%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/dispatch/JobExecutorResultActor.java (69%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/dispatch/JobLogActor.java (94%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/dispatch/JobTaskPrepareActor.java (93%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/dispatch/ScanJobTaskActor.java (87%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/executor/AbstractJobExecutor.java (77%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/executor/BroadcastTaskJobExecutor.java (90%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/executor/ClusterJobExecutor.java (89%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/executor/JobExecutorContext.java (90%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/executor/JobExecutorFactory.java (82%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/executor/RealJobExecutorActor.java (97%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/executor/ShardingJobExecutor.java (90%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/generator/batch/JobTaskBatchGenerator.java (93%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/generator/batch/JobTaskBatchGeneratorContext.java (86%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/generator/task/AbstractJobTaskGenerator.java (90%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/generator/task/BroadcastTaskGenerator.java (95%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/generator/task/ClusterTaskGenerator.java (94%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/generator/task/JobTaskGenerateContext.java (76%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/generator/task/JobTaskGenerator.java (84%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/generator/task/JobTaskGeneratorFactory.java (90%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/generator/task/ShardingTaskGenerator.java (95%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler/helper/JobTaskBatchHelper.java => support/handler/JobTaskBatchHandler.java} (95%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/prepare/AbstractJobPrePareHandler.java (75%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/prepare/RunningJobPrepareHandler.java (70%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/prepare/TerminalJobPrepareHandler.java (84%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/prepare/WaitJobPrepareHandler.java (90%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/request/ReportDispatchResultPostHttpRequestHandler.java (88%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/stop/AbstractJobTaskStopHandler.java (91%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/stop/BroadcastTaskStopHandler.java (77%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/stop/ClusterTaskStopHandler.java (66%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/stop/JobTaskStopFactory.java (82%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/stop/RealStopTaskActor.java (97%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/stop/ShardingTaskStopHandler.java (89%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/stop/TaskStopJobContext.java (92%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/strategy/BlockStrategies.java (85%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{ => support}/strategy/WaitStrategies.java (87%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/timer/JobTimerTask.java (90%) rename easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/{handler => support}/timer/JobTimerWheelHandler.java (98%) rename easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/{config/EasyRetryServerRetryTaskAutoConfiguration.java => EasyRetryRetryTaskStarter.java} (59%) rename easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/{AbstractTaskActuator.java => AbstractTaskExecutor.java} (93%) rename easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/{CallbackTaskActuator.java => CallbackTaskExecutor.java} (92%) rename easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/{ManualCallbackTaskActuator.java => ManualCallbackTaskExecutor.java} (94%) rename easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/{ManualRetryTaskActuator.java => ManualRetryTaskExecutor.java} (95%) rename easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/{RetryTaskActuator.java => RetryTaskExecutor.java} (93%) rename easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/{TaskActuator.java => TaskExecutor.java} (66%) rename easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/{TaskActuatorSceneEnum.java => TaskExecutorSceneEnum.java} (93%) rename easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/{dispatch/actor => timer}/AbstractTimerTask.java (88%) rename easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/{dispatch/actor => timer}/CallbackTimerTask.java (82%) rename easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/{dispatch/actor => timer}/RetryTimerContext.java (65%) rename easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/{dispatch/actor => timer}/RetryTimerTask.java (78%) rename easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/{dispatch/actor => timer}/TimerWheelHandler.java (97%) rename easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/{config/EasyRetryServerWebAutoConfiguration.java => EasyRetryWebStarter.java} (60%) create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobBatchController.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobLogController.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobTaskController.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobBatchQueryVO.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobLogQueryVO.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobTaskQueryVO.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/JobBatchResponseVO.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/JobLogResponseVO.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/JobTaskResponseVO.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobBatchService.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobLogService.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobTaskService.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobBatchResponseVOConverter.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobConverter.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobLogResponseVOConverter.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobTaskResponseVOConverter.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobBatchServiceImpl.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobLogServiceImpl.java create mode 100644 easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobTaskServiceImpl.java diff --git a/doc/sql/easy_retry_mysql.sql b/doc/sql/easy_retry_mysql.sql index a64f4f71..c88a328f 100644 --- a/doc/sql/easy_retry_mysql.sql +++ b/doc/sql/easy_retry_mysql.sql @@ -220,13 +220,13 @@ CREATE TABLE `job` ( `group_name` varchar(64) NOT NULL COMMENT '组名称', `job_name` varchar(64) NOT NULL COMMENT '名称', `args_str` text NOT NULL COMMENT '执行方法参数', - `args_type` varchar(16) NOT NULL DEFAULT '' COMMENT '参数类型 text/json', + `args_type` tinyint(4) NOT NULL DEFAULT '' COMMENT '参数类型 ', `ext_attrs` text NOT NULL COMMENT '扩展字段', `next_trigger_at` datetime NOT NULL COMMENT '下次触发时间', `job_status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '重试状态 0、关闭、1、开启', `task_type` varchar(255) DEFAULT NULL COMMENT '任务类型 1、集群 2、广播 3、切片', `route_key` varchar(50) DEFAULT NULL COMMENT '执行器路由策略', - `executor_type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '执行器类型 1、Java', + `executor_type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '执行器类型', `executor_name` varchar(255) DEFAULT NULL COMMENT '执行器名称', `trigger_type` tinyint(4) NOT NULL COMMENT '触发类型 1.CRON 表达式 2. 固定时间', `trigger_interval` varchar(255) NOT NULL COMMENT '间隔时长', diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java index a76c6cd3..de16e8af 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/mapper/JobTaskBatchMapper.java @@ -16,5 +16,4 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface JobTaskBatchMapper extends BaseMapper { - int updateJobTaskBatchStatus(@Param("taskBatchId") Long taskBatchId, @Param("taskStatus") Integer taskStatus); } diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/Job.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/Job.java index 2d13f5ab..4d8b1222 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/Job.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/Job.java @@ -47,7 +47,7 @@ public class Job implements Serializable { /** * 参数类型 text/json */ - private String argsType; + private Integer argsType; /** * 扩展字段 diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobTask.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobTask.java index ada7dc80..4e2a2a20 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobTask.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobTask.java @@ -79,7 +79,7 @@ public class JobTask implements Serializable { /** * 参数类型 text/json */ - private String argsType; + private Integer argsType; /** * 扩展字段 diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml index af4ed398..9a12dc50 100644 --- a/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml +++ b/easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml @@ -13,22 +13,4 @@ - - update job_task_batch - set task_status = #{taskStatus} - - id = #{taskBatchId} - - and EXISTS (select id from job_task where task_batch_id = #{taskBatchId} and execute_status = 4) - - - and NOT EXISTS (select id from job_task where task_batch_id = #{taskBatchId} and execute_status IN(1, 2, 4, 5)) - - - and NOT EXISTS (select id from job_task where task_batch_id = #{taskBatchId} and execute_status IN(1, 2)) - - - - - diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/cache/CacheRegisterTable.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/cache/CacheRegisterTable.java index 1cc79674..8e52cf9b 100644 --- a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/cache/CacheRegisterTable.java +++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/cache/CacheRegisterTable.java @@ -135,8 +135,8 @@ public class CacheRegisterTable implements Lifecycle { registerNodeInfo.setExpireAt(serverNode.getExpireAt()); } - LogUtils.info(log, "Update cache. groupName:[{}] hostId:[{}] hostIp:[{}] expireAt:[{}]", groupName, - serverNode.getHostId(), serverNode.getHostIp(), serverNode.getExpireAt()); +// LogUtils.info(log, "Update cache. groupName:[{}] hostId:[{}] hostIp:[{}] expireAt:[{}]", groupName, +// serverNode.getHostId(), serverNode.getHostIp(), serverNode.getExpireAt()); concurrentMap.put(serverNode.getHostId(), registerNodeInfo); } diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/config/EasyRetryServerCommonAutoConfiguration.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/config/EasyRetryServerCommonAutoConfiguration.java index d177ed6f..fe2464ae 100644 --- a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/config/EasyRetryServerCommonAutoConfiguration.java +++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/config/EasyRetryServerCommonAutoConfiguration.java @@ -8,6 +8,7 @@ import org.springframework.context.annotation.Configuration; * * @author: www.byteblogs.com * @date : 2023-09-19 09:21 + * @since : 2.4.0 */ @Configuration @ComponentScan("com.aizuda.easy.retry.server.common.*") diff --git a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/generator/id/SegmentIdGenerator.java b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/generator/id/SegmentIdGenerator.java index 4e181b12..cd644cf3 100644 --- a/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/generator/id/SegmentIdGenerator.java +++ b/easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/generator/id/SegmentIdGenerator.java @@ -114,7 +114,6 @@ public class SegmentIdGenerator implements IdGenerator, Lifecycle { } private void updateCacheFromDb() { - LogUtils.info(log, "update cache from db"); StopWatch sw = new Slf4JStopWatch(); try { List sequenceAllocs = sequenceAllocMapper @@ -189,7 +188,6 @@ public class SegmentIdGenerator implements IdGenerator, Lifecycle { } public void updateSegmentFromDb(String key, Segment segment) { - StopWatch sw = new Slf4JStopWatch(); SegmentBuffer buffer = segment.getBuffer(); SequenceAlloc sequenceAlloc; if (!buffer.isInitOk()) { @@ -231,7 +229,6 @@ public class SegmentIdGenerator implements IdGenerator, Lifecycle { segment.getValue().set(value); segment.setMax(sequenceAlloc.getMaxId()); segment.setStep(buffer.getStep()); - sw.stop("updateSegmentFromDb", key + " " + segment); } public String getIdFromSegmentBuffer(final SegmentBuffer buffer) { diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/EasyRetryJobTaskStarter.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/EasyRetryJobTaskStarter.java deleted file mode 100644 index 0fcf1cc7..00000000 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/EasyRetryJobTaskStarter.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.aizuda.easy.retry.server.job; - -import com.aizuda.easy.retry.server.common.Lifecycle; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author www.byteblogs.com - * @date 2023-09-29 23:29:44 - * @since 2.4.0 - */ -@Component -@Slf4j -public class EasyRetryJobTaskStarter implements Lifecycle { - - @Override - public void start() { - // 检查是否还有未执行的任务，如果有则直接失败 - log.info("easy-retry-job-task starting..."); - - log.info("easy-retry-job-task completed"); - } - - @Override - public void close() { - // 关闭还未执行的任务 - } -} diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/BlockStrategy.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/BlockStrategy.java deleted file mode 100644 index 9ffe5770..00000000 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/BlockStrategy.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.aizuda.easy.retry.server.job.task; - -import com.aizuda.easy.retry.server.job.task.strategy.BlockStrategies.BlockStrategyContext; - -/** - * @author: www.byteblogs.com - * @date : 2023-09-25 17:53 - */ -public interface BlockStrategy { - void block(BlockStrategyContext context); -} diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/config/EasyRetryServerRetryJobAutoConfiguration.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/EasyRetryJobTaskStarter.java similarity index 52% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/config/EasyRetryServerRetryJobAutoConfiguration.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/EasyRetryJobTaskStarter.java index 77f31ced..b7731b1b 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/config/EasyRetryServerRetryJobAutoConfiguration.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/EasyRetryJobTaskStarter.java @@ -1,16 +1,15 @@ -package com.aizuda.easy.retry.server.job.task.config; +package com.aizuda.easy.retry.server.job.task; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; /** - * web访问模块 - * - * @author: www.byteblogs.com - * @date : 2023-09-19 09:21 + * @author www.byteblogs.com + * @date 2023-09-29 23:29:44 + * @since 2.4.0 */ @Configuration @ComponentScan("com.aizuda.easy.retry.server.job.task.*") -public class EasyRetryServerRetryJobAutoConfiguration { +public class EasyRetryJobTaskStarter { } diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/BlockStrategy.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/BlockStrategy.java new file mode 100644 index 00000000..8d755be2 --- /dev/null +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/BlockStrategy.java @@ -0,0 +1,11 @@ +package com.aizuda.easy.retry.server.job.task.support; + +import com.aizuda.easy.retry.server.job.task.support.strategy.BlockStrategies.BlockStrategyContext; + +/** + * @author: www.byteblogs.com + * @date : 2023-09-25 17:53 + */ +public interface BlockStrategy { + void block(BlockStrategyContext context); +} diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ClientCallbackHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/ClientCallbackHandler.java similarity index 66% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ClientCallbackHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/ClientCallbackHandler.java index 7543d4e9..a2638a25 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ClientCallbackHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/ClientCallbackHandler.java @@ -1,6 +1,7 @@ -package com.aizuda.easy.retry.server.job.task.handler.callback; +package com.aizuda.easy.retry.server.job.task.support; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; +import com.aizuda.easy.retry.server.job.task.support.callback.ClientCallbackContext; /** * @author www.byteblogs.com diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/JobExecutor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobExecutor.java similarity index 66% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/JobExecutor.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobExecutor.java index 88ace6ea..a34ac69e 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/JobExecutor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobExecutor.java @@ -1,6 +1,7 @@ -package com.aizuda.easy.retry.server.job.task.handler.executor; +package com.aizuda.easy.retry.server.job.task.support; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; +import com.aizuda.easy.retry.server.job.task.support.executor.JobExecutorContext; /** * @author www.byteblogs.com diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/JobPrePareHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobPrePareHandler.java similarity index 81% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/JobPrePareHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobPrePareHandler.java index 20ee7eee..9afdc721 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/JobPrePareHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobPrePareHandler.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.handler.prepare; +package com.aizuda.easy.retry.server.job.task.support; import com.aizuda.easy.retry.server.job.task.dto.JobTaskPrepareDTO; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/JobTaskConverter.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskConverter.java similarity index 84% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/JobTaskConverter.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskConverter.java index 4ffeca31..6ecc1ab3 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/JobTaskConverter.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskConverter.java @@ -1,14 +1,14 @@ -package com.aizuda.easy.retry.server.job.task; +package com.aizuda.easy.retry.server.job.task.support; import com.aizuda.easy.retry.client.model.request.DispatchJobRequest; import com.aizuda.easy.retry.client.model.request.DispatchJobResultRequest; import com.aizuda.easy.retry.server.job.task.dto.*; -import com.aizuda.easy.retry.server.job.task.generator.batch.JobTaskBatchGeneratorContext; -import com.aizuda.easy.retry.server.job.task.generator.task.JobTaskGenerateContext; -import com.aizuda.easy.retry.server.job.task.handler.callback.ClientCallbackContext; -import com.aizuda.easy.retry.server.job.task.handler.executor.JobExecutorContext; -import com.aizuda.easy.retry.server.job.task.handler.stop.TaskStopJobContext; -import com.aizuda.easy.retry.server.job.task.strategy.BlockStrategies; +import com.aizuda.easy.retry.server.job.task.support.generator.batch.JobTaskBatchGeneratorContext; +import com.aizuda.easy.retry.server.job.task.support.generator.task.JobTaskGenerateContext; +import com.aizuda.easy.retry.server.job.task.support.callback.ClientCallbackContext; +import com.aizuda.easy.retry.server.job.task.support.executor.JobExecutorContext; +import com.aizuda.easy.retry.server.job.task.support.stop.TaskStopJobContext; +import com.aizuda.easy.retry.server.job.task.support.strategy.BlockStrategies; import com.aizuda.easy.retry.template.datasource.persistence.po.Job; import com.aizuda.easy.retry.template.datasource.persistence.po.JobLogMessage; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/JobTaskStopHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskStopHandler.java similarity index 66% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/JobTaskStopHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskStopHandler.java index 0e1e0340..29328b14 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/JobTaskStopHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskStopHandler.java @@ -1,6 +1,7 @@ -package com.aizuda.easy.retry.server.job.task.handler.stop; +package com.aizuda.easy.retry.server.job.task.support; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; +import com.aizuda.easy.retry.server.job.task.support.stop.TaskStopJobContext; /** * @author www.byteblogs.com diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/WaitStrategy.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/WaitStrategy.java similarity index 76% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/WaitStrategy.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/WaitStrategy.java index d5617d81..685b2cc9 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/WaitStrategy.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/WaitStrategy.java @@ -1,6 +1,6 @@ -package com.aizuda.easy.retry.server.job.task; +package com.aizuda.easy.retry.server.job.task.support; -import com.aizuda.easy.retry.server.job.task.strategy.WaitStrategies; +import com.aizuda.easy.retry.server.job.task.support.strategy.WaitStrategies; import java.time.LocalDateTime; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/AbstractClientCallbackHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/AbstractClientCallbackHandler.java similarity index 82% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/AbstractClientCallbackHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/AbstractClientCallbackHandler.java index 0e52b769..f16a12ac 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/AbstractClientCallbackHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/AbstractClientCallbackHandler.java @@ -1,5 +1,6 @@ -package com.aizuda.easy.retry.server.job.task.handler.callback; +package com.aizuda.easy.retry.server.job.task.support.callback; +import com.aizuda.easy.retry.server.job.task.support.ClientCallbackHandler; import org.springframework.beans.factory.InitializingBean; import org.springframework.transaction.annotation.Transactional; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/BroadcastClientCallbackHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/BroadcastClientCallbackHandler.java similarity index 88% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/BroadcastClientCallbackHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/BroadcastClientCallbackHandler.java index 69e6c3ac..0e7855c9 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/BroadcastClientCallbackHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/BroadcastClientCallbackHandler.java @@ -1,15 +1,13 @@ -package com.aizuda.easy.retry.server.job.task.handler.callback; +package com.aizuda.easy.retry.server.job.task.support.callback; import akka.actor.ActorRef; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.JobExecutorResultDTO; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import java.util.Collections; - /** * @author: www.byteblogs.com * @date : 2023-10-07 10:24 diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ClientCallbackContext.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClientCallbackContext.java similarity index 86% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ClientCallbackContext.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClientCallbackContext.java index 4da00a90..2b145424 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ClientCallbackContext.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClientCallbackContext.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.handler.callback; +package com.aizuda.easy.retry.server.job.task.support.callback; import com.aizuda.easy.retry.client.model.ExecuteResult; import lombok.Data; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ClientCallbackFactory.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClientCallbackFactory.java similarity index 82% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ClientCallbackFactory.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClientCallbackFactory.java index d5f947d7..b371b322 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ClientCallbackFactory.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClientCallbackFactory.java @@ -1,6 +1,7 @@ -package com.aizuda.easy.retry.server.job.task.handler.callback; +package com.aizuda.easy.retry.server.job.task.support.callback; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; +import com.aizuda.easy.retry.server.job.task.support.ClientCallbackHandler; import java.util.concurrent.ConcurrentHashMap; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ClusterClientCallbackHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClusterClientCallbackHandler.java similarity index 90% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ClusterClientCallbackHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClusterClientCallbackHandler.java index 578fa618..081c6a4a 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ClusterClientCallbackHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ClusterClientCallbackHandler.java @@ -1,8 +1,8 @@ -package com.aizuda.easy.retry.server.job.task.handler.callback; +package com.aizuda.easy.retry.server.job.task.support.callback; import akka.actor.ActorRef; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.JobExecutorResultDTO; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; import lombok.extern.slf4j.Slf4j; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ShardingClientCallbackHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ShardingClientCallbackHandler.java similarity index 88% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ShardingClientCallbackHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ShardingClientCallbackHandler.java index ec2082a9..4b014dbd 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/callback/ShardingClientCallbackHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/callback/ShardingClientCallbackHandler.java @@ -1,15 +1,13 @@ -package com.aizuda.easy.retry.server.job.task.handler.callback; +package com.aizuda.easy.retry.server.job.task.support.callback; import akka.actor.ActorRef; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.JobExecutorResultDTO; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import java.util.Collections; - /** * @author: www.byteblogs.com * @date : 2023-10-07 10:24 diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/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 similarity index 88% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/dispatch/JobExecutorActor.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorActor.java index 8ec3f137..0e2e3141 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/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 @@ -1,12 +1,12 @@ -package com.aizuda.easy.retry.server.job.task.dispatch; +package com.aizuda.easy.retry.server.job.task.support.dispatch; import akka.actor.AbstractActor; import com.aizuda.easy.retry.common.core.log.LogUtils; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.job.task.dto.TaskExecuteDTO; -import com.aizuda.easy.retry.server.job.task.handler.executor.JobExecutor; -import com.aizuda.easy.retry.server.job.task.handler.executor.JobExecutorContext; -import com.aizuda.easy.retry.server.job.task.handler.executor.JobExecutorFactory; +import com.aizuda.easy.retry.server.job.task.support.JobExecutor; +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.template.datasource.persistence.mapper.JobMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.Job; import lombok.extern.slf4j.Slf4j; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/dispatch/JobExecutorResultActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorResultActor.java similarity index 69% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/dispatch/JobExecutorResultActor.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorResultActor.java index 49a7e9b8..7a399dc9 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/dispatch/JobExecutorResultActor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorResultActor.java @@ -1,31 +1,18 @@ -package com.aizuda.easy.retry.server.job.task.dispatch; +package com.aizuda.easy.retry.server.job.task.support.dispatch; import akka.actor.AbstractActor; import akka.actor.ActorRef; import cn.hutool.core.lang.Assert; -import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum; import com.aizuda.easy.retry.common.core.util.JsonUtil; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.common.cache.CacheGroupScanActor; -import com.aizuda.easy.retry.server.common.dto.ScanTask; -import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum; import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; -import com.aizuda.easy.retry.server.job.task.WaitStrategy; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.JobExecutorResultDTO; import com.aizuda.easy.retry.server.job.task.dto.JobLogDTO; -import com.aizuda.easy.retry.server.job.task.dto.JobTaskPrepareDTO; -import com.aizuda.easy.retry.server.job.task.handler.helper.JobTaskBatchHelper; -import com.aizuda.easy.retry.server.job.task.strategy.WaitStrategies.WaitStrategyContext; -import com.aizuda.easy.retry.server.job.task.strategy.WaitStrategies.WaitStrategyEnum; +import com.aizuda.easy.retry.server.job.task.support.handler.JobTaskBatchHandler; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskMapper; -import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskBatchMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; -import com.aizuda.easy.retry.template.datasource.persistence.po.JobTaskBatch; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -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.beans.factory.config.ConfigurableBeanFactory; @@ -35,7 +22,6 @@ import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallbackWithoutResult; import org.springframework.transaction.support.TransactionTemplate; -import java.time.LocalDateTime; import java.util.Objects; /** @@ -53,9 +39,7 @@ public class JobExecutorResultActor extends AbstractActor { @Autowired private TransactionTemplate transactionTemplate; @Autowired - private JobTaskBatchHelper jobTaskBatchHelper; - @Autowired - private JobTaskBatchMapper jobTaskBatchMapper; + private JobTaskBatchHandler jobTaskBatchHandler; @Override public Receive createReceive() { @@ -76,7 +60,7 @@ public class JobExecutorResultActor extends AbstractActor { ()-> new EasyRetryServerException("更新任务实例失败")); // 更新批次上的状态 - jobTaskBatchHelper.complete(result.getTaskBatchId()); + jobTaskBatchHandler.complete(result.getTaskBatchId()); } }); diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/dispatch/JobLogActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobLogActor.java similarity index 94% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/dispatch/JobLogActor.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobLogActor.java index bc4bc5ba..ea76a330 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/dispatch/JobLogActor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobLogActor.java @@ -1,10 +1,10 @@ -package com.aizuda.easy.retry.server.job.task.dispatch; +package com.aizuda.easy.retry.server.job.task.support.dispatch; import akka.actor.AbstractActor; import cn.hutool.core.util.StrUtil; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.common.cache.CacheRegisterTable; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.JobLogDTO; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobLogMessageMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.JobLogMessage; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/dispatch/JobTaskPrepareActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobTaskPrepareActor.java similarity index 93% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/dispatch/JobTaskPrepareActor.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobTaskPrepareActor.java index 61341b96..425e01c4 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/dispatch/JobTaskPrepareActor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobTaskPrepareActor.java @@ -1,11 +1,11 @@ -package com.aizuda.easy.retry.server.job.task.dispatch; +package com.aizuda.easy.retry.server.job.task.support.dispatch; import akka.actor.AbstractActor; import com.aizuda.easy.retry.common.core.context.SpringContext; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.job.task.dto.JobTaskPrepareDTO; -import com.aizuda.easy.retry.server.job.task.handler.prepare.JobPrePareHandler; -import com.aizuda.easy.retry.server.job.task.handler.prepare.TerminalJobPrepareHandler; +import com.aizuda.easy.retry.server.job.task.support.JobPrePareHandler; +import com.aizuda.easy.retry.server.job.task.support.prepare.TerminalJobPrepareHandler; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskBatchMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTaskBatch; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/dispatch/ScanJobTaskActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanJobTaskActor.java similarity index 87% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/dispatch/ScanJobTaskActor.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanJobTaskActor.java index 0d916c2d..a430abb9 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/dispatch/ScanJobTaskActor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanJobTaskActor.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.dispatch; +package com.aizuda.easy.retry.server.job.task.support.dispatch; import akka.actor.AbstractActor; import akka.actor.ActorRef; @@ -7,12 +7,11 @@ import com.aizuda.easy.retry.common.core.enums.StatusEnum; import com.aizuda.easy.retry.common.core.log.LogUtils; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.common.cache.CacheConsumerGroup; -import com.aizuda.easy.retry.server.common.dto.PartitionTask; import com.aizuda.easy.retry.server.common.dto.ScanTask; import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; import com.aizuda.easy.retry.server.common.util.PartitionTaskUtils; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; -import com.aizuda.easy.retry.server.job.task.WaitStrategy; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.WaitStrategy; import com.aizuda.easy.retry.server.job.task.dto.JobPartitionTask; import com.aizuda.easy.retry.server.job.task.dto.JobTaskPrepareDTO; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobMapper; @@ -24,18 +23,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.concurrent.Executor; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Consumer; -import java.util.function.Function; -import static com.aizuda.easy.retry.server.job.task.strategy.WaitStrategies.*; +import static com.aizuda.easy.retry.server.job.task.support.strategy.WaitStrategies.*; /** * JOB任务扫描 diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/AbstractJobExecutor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/AbstractJobExecutor.java similarity index 77% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/AbstractJobExecutor.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/AbstractJobExecutor.java index 8764bd31..b620113e 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/AbstractJobExecutor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/AbstractJobExecutor.java @@ -1,9 +1,10 @@ -package com.aizuda.easy.retry.server.job.task.handler.executor; +package com.aizuda.easy.retry.server.job.task.support.executor; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; -import com.aizuda.easy.retry.server.job.task.generator.task.JobTaskGenerateContext; -import com.aizuda.easy.retry.server.job.task.generator.task.JobTaskGenerator; -import com.aizuda.easy.retry.server.job.task.generator.task.JobTaskGeneratorFactory; +import com.aizuda.easy.retry.server.job.task.support.JobExecutor; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.generator.task.JobTaskGenerateContext; +import com.aizuda.easy.retry.server.job.task.support.generator.task.JobTaskGenerator; +import com.aizuda.easy.retry.server.job.task.support.generator.task.JobTaskGeneratorFactory; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.Job; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/BroadcastTaskJobExecutor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/BroadcastTaskJobExecutor.java similarity index 90% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/BroadcastTaskJobExecutor.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/BroadcastTaskJobExecutor.java index b96ac911..e0bc7c4f 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/BroadcastTaskJobExecutor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/BroadcastTaskJobExecutor.java @@ -1,8 +1,8 @@ -package com.aizuda.easy.retry.server.job.task.handler.executor; +package com.aizuda.easy.retry.server.job.task.support.executor; import akka.actor.ActorRef; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.RealJobExecutorDTO; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.po.Job; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/ClusterJobExecutor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/ClusterJobExecutor.java similarity index 89% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/ClusterJobExecutor.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/ClusterJobExecutor.java index bae67fd3..d12c293e 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/ClusterJobExecutor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/ClusterJobExecutor.java @@ -1,8 +1,8 @@ -package com.aizuda.easy.retry.server.job.task.handler.executor; +package com.aizuda.easy.retry.server.job.task.support.executor; import akka.actor.ActorRef; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.RealJobExecutorDTO; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.po.Job; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/JobExecutorContext.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/JobExecutorContext.java similarity index 90% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/JobExecutorContext.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/JobExecutorContext.java index 14117133..8d861dee 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/JobExecutorContext.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/JobExecutorContext.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.handler.executor; +package com.aizuda.easy.retry.server.job.task.support.executor; import com.aizuda.easy.retry.template.datasource.persistence.po.Job; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/JobExecutorFactory.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/JobExecutorFactory.java similarity index 82% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/JobExecutorFactory.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/JobExecutorFactory.java index 71181ede..01de3942 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/JobExecutorFactory.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/JobExecutorFactory.java @@ -1,6 +1,7 @@ -package com.aizuda.easy.retry.server.job.task.handler.executor; +package com.aizuda.easy.retry.server.job.task.support.executor; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; +import com.aizuda.easy.retry.server.job.task.support.JobExecutor; import java.util.concurrent.ConcurrentHashMap; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/RealJobExecutorActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/RealJobExecutorActor.java similarity index 97% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/RealJobExecutorActor.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/RealJobExecutorActor.java index 43557c55..0d211046 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/RealJobExecutorActor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/RealJobExecutorActor.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.handler.executor; +package com.aizuda.easy.retry.server.job.task.support.executor; import akka.actor.AbstractActor; import akka.actor.ActorRef; @@ -11,7 +11,7 @@ import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.common.cache.CacheRegisterTable; import com.aizuda.easy.retry.server.common.client.RequestBuilder; import com.aizuda.easy.retry.server.common.dto.RegisterNodeInfo; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.client.JobRpcClient; import com.aizuda.easy.retry.server.job.task.dto.JobExecutorResultDTO; import com.aizuda.easy.retry.server.job.task.dto.JobLogDTO; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/ShardingJobExecutor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/ShardingJobExecutor.java similarity index 90% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/ShardingJobExecutor.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/ShardingJobExecutor.java index 52f2d2ca..7d1dbbd0 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/executor/ShardingJobExecutor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/ShardingJobExecutor.java @@ -1,8 +1,8 @@ -package com.aizuda.easy.retry.server.job.task.handler.executor; +package com.aizuda.easy.retry.server.job.task.support.executor; import akka.actor.ActorRef; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.RealJobExecutorDTO; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.po.Job; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/batch/JobTaskBatchGenerator.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/batch/JobTaskBatchGenerator.java similarity index 93% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/batch/JobTaskBatchGenerator.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/batch/JobTaskBatchGenerator.java index 50aed393..5bca631f 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/batch/JobTaskBatchGenerator.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/batch/JobTaskBatchGenerator.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.generator.batch; +package com.aizuda.easy.retry.server.job.task.support.generator.batch; import cn.hutool.core.lang.Assert; import com.aizuda.easy.retry.common.core.enums.JobOperationReasonEnum; @@ -6,8 +6,8 @@ import com.aizuda.easy.retry.server.common.cache.CacheRegisterTable; import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; import com.aizuda.easy.retry.server.job.task.dto.JobTimerTaskDTO; import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum; -import com.aizuda.easy.retry.server.job.task.handler.timer.JobTimerTask; -import com.aizuda.easy.retry.server.job.task.handler.timer.JobTimerWheelHandler; +import com.aizuda.easy.retry.server.job.task.support.timer.JobTimerTask; +import com.aizuda.easy.retry.server.job.task.support.timer.JobTimerWheelHandler; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskBatchMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTaskBatch; import lombok.extern.slf4j.Slf4j; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/batch/JobTaskBatchGeneratorContext.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/batch/JobTaskBatchGeneratorContext.java similarity index 86% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/batch/JobTaskBatchGeneratorContext.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/batch/JobTaskBatchGeneratorContext.java index 95adc7d3..5487dedc 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/batch/JobTaskBatchGeneratorContext.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/batch/JobTaskBatchGeneratorContext.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.generator.batch; +package com.aizuda.easy.retry.server.job.task.support.generator.batch; import lombok.Data; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/AbstractJobTaskGenerator.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/AbstractJobTaskGenerator.java similarity index 90% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/AbstractJobTaskGenerator.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/AbstractJobTaskGenerator.java index 548dab4d..5d965d18 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/AbstractJobTaskGenerator.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/AbstractJobTaskGenerator.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.generator.task; +package com.aizuda.easy.retry.server.job.task.support.generator.task; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; import org.springframework.beans.factory.InitializingBean; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/BroadcastTaskGenerator.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/BroadcastTaskGenerator.java similarity index 95% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/BroadcastTaskGenerator.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/BroadcastTaskGenerator.java index cb0ef15d..1cdc5dc0 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/BroadcastTaskGenerator.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/BroadcastTaskGenerator.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.generator.task; +package com.aizuda.easy.retry.server.job.task.support.generator.task; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; @@ -6,7 +6,7 @@ import com.aizuda.easy.retry.common.core.enums.JobTaskStatusEnum; import com.aizuda.easy.retry.server.common.cache.CacheRegisterTable; import com.aizuda.easy.retry.server.common.dto.RegisterNodeInfo; import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobMapper; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskMapper; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/ClusterTaskGenerator.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ClusterTaskGenerator.java similarity index 94% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/ClusterTaskGenerator.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ClusterTaskGenerator.java index 6f05c85e..51d87efa 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/ClusterTaskGenerator.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ClusterTaskGenerator.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.generator.task; +package com.aizuda.easy.retry.server.job.task.support.generator.task; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; @@ -6,7 +6,7 @@ import com.aizuda.easy.retry.common.core.enums.JobTaskStatusEnum; import com.aizuda.easy.retry.server.common.dto.RegisterNodeInfo; import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; import com.aizuda.easy.retry.server.common.handler.ClientNodeAllocateHandler; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobMapper; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskMapper; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/JobTaskGenerateContext.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGenerateContext.java similarity index 76% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/JobTaskGenerateContext.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGenerateContext.java index 75eae9d3..b778eb03 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/JobTaskGenerateContext.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGenerateContext.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.generator.task; +package com.aizuda.easy.retry.server.job.task.support.generator.task; import lombok.Data; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/JobTaskGenerator.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGenerator.java similarity index 84% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/JobTaskGenerator.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGenerator.java index 8e0f0031..dd2f053e 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/JobTaskGenerator.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGenerator.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.generator.task; +package com.aizuda.easy.retry.server.job.task.support.generator.task; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/JobTaskGeneratorFactory.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGeneratorFactory.java similarity index 90% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/JobTaskGeneratorFactory.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGeneratorFactory.java index ef08a0b8..152cbe36 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/JobTaskGeneratorFactory.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/JobTaskGeneratorFactory.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.generator.task; +package com.aizuda.easy.retry.server.job.task.support.generator.task; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/ShardingTaskGenerator.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ShardingTaskGenerator.java similarity index 95% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/ShardingTaskGenerator.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ShardingTaskGenerator.java index e34705f6..64768e6b 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/generator/task/ShardingTaskGenerator.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/task/ShardingTaskGenerator.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.generator.task; +package com.aizuda.easy.retry.server.job.task.support.generator.task; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; @@ -7,7 +7,7 @@ import com.aizuda.easy.retry.server.common.cache.CacheRegisterTable; import com.aizuda.easy.retry.server.common.dto.RegisterNodeInfo; import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; import com.aizuda.easy.retry.server.common.handler.ClientNodeAllocateHandler; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobMapper; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskMapper; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/helper/JobTaskBatchHelper.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/handler/JobTaskBatchHandler.java similarity index 95% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/helper/JobTaskBatchHelper.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/handler/JobTaskBatchHandler.java index d297f9cc..245169d3 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/helper/JobTaskBatchHelper.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,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.handler.helper; +package com.aizuda.easy.retry.server.job.task.support.handler; import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum; import com.aizuda.easy.retry.common.core.enums.JobTaskStatusEnum; @@ -17,7 +17,7 @@ import java.util.List; * @date : 2023-10-10 16:50 */ @Component -public class JobTaskBatchHelper { +public class JobTaskBatchHandler { @Autowired private JobTaskMapper jobTaskMapper; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/AbstractJobPrePareHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/AbstractJobPrePareHandler.java similarity index 75% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/AbstractJobPrePareHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/AbstractJobPrePareHandler.java index bb959c7b..b91c2024 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/AbstractJobPrePareHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/AbstractJobPrePareHandler.java @@ -1,6 +1,7 @@ -package com.aizuda.easy.retry.server.job.task.handler.prepare; +package com.aizuda.easy.retry.server.job.task.support.prepare; import com.aizuda.easy.retry.server.job.task.dto.JobTaskPrepareDTO; +import com.aizuda.easy.retry.server.job.task.support.JobPrePareHandler; /** * @author www.byteblogs.com diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/RunningJobPrepareHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/RunningJobPrepareHandler.java similarity index 70% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/RunningJobPrepareHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/RunningJobPrepareHandler.java index 703a77ac..86dfce40 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/RunningJobPrepareHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/RunningJobPrepareHandler.java @@ -1,21 +1,16 @@ -package com.aizuda.easy.retry.server.job.task.handler.prepare; +package com.aizuda.easy.retry.server.job.task.support.prepare; import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum; -import com.aizuda.easy.retry.server.job.task.BlockStrategy; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.BlockStrategy; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.JobTaskPrepareDTO; -import com.aizuda.easy.retry.server.job.task.handler.helper.JobTaskBatchHelper; -import com.aizuda.easy.retry.server.job.task.strategy.BlockStrategies; -import com.aizuda.easy.retry.server.job.task.strategy.BlockStrategies.BlockStrategyEnum; -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; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.aizuda.easy.retry.server.job.task.support.strategy.BlockStrategies; +import com.aizuda.easy.retry.server.job.task.support.strategy.BlockStrategies.BlockStrategyEnum; +import com.aizuda.easy.retry.server.job.task.support.handler.JobTaskBatchHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.time.Duration; import java.time.ZoneId; /** @@ -30,7 +25,7 @@ import java.time.ZoneId; public class RunningJobPrepareHandler extends AbstractJobPrePareHandler { @Autowired - private JobTaskBatchHelper jobTaskBatchHelper; + private JobTaskBatchHandler jobTaskBatchHandler; @Override public boolean matches(Integer status) { @@ -43,7 +38,7 @@ public class RunningJobPrepareHandler extends AbstractJobPrePareHandler { // 若存在所有的任务都是完成，但是批次上的状态为运行中，则是并发导致的未把批次状态变成为终态，此处做一次兜底处理 int blockStrategy = prepare.getBlockStrategy(); - if (jobTaskBatchHelper.complete(prepare.getTaskBatchId())) { + if (jobTaskBatchHandler.complete(prepare.getTaskBatchId())) { blockStrategy = BlockStrategyEnum.CONCURRENCY.getBlockStrategy(); } else { // 计算超时时间 diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/TerminalJobPrepareHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/TerminalJobPrepareHandler.java similarity index 84% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/TerminalJobPrepareHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/TerminalJobPrepareHandler.java index 78602c3b..ece1a07e 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/TerminalJobPrepareHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/TerminalJobPrepareHandler.java @@ -1,9 +1,9 @@ -package com.aizuda.easy.retry.server.job.task.handler.prepare; +package com.aizuda.easy.retry.server.job.task.support.prepare; import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.JobTaskPrepareDTO; -import com.aizuda.easy.retry.server.job.task.generator.batch.JobTaskBatchGenerator; +import com.aizuda.easy.retry.server.job.task.support.generator.batch.JobTaskBatchGenerator; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.Ordered; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/WaitJobPrepareHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/WaitJobPrepareHandler.java similarity index 90% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/WaitJobPrepareHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/WaitJobPrepareHandler.java index 48dd4e17..630492f0 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/prepare/WaitJobPrepareHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/WaitJobPrepareHandler.java @@ -1,10 +1,10 @@ -package com.aizuda.easy.retry.server.job.task.handler.prepare; +package com.aizuda.easy.retry.server.job.task.support.prepare; import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum; import com.aizuda.easy.retry.server.job.task.dto.JobTaskPrepareDTO; import com.aizuda.easy.retry.server.job.task.dto.JobTimerTaskDTO; -import com.aizuda.easy.retry.server.job.task.handler.timer.JobTimerWheelHandler; -import com.aizuda.easy.retry.server.job.task.handler.timer.JobTimerTask; +import com.aizuda.easy.retry.server.job.task.support.timer.JobTimerWheelHandler; +import com.aizuda.easy.retry.server.job.task.support.timer.JobTimerTask; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/request/ReportDispatchResultPostHttpRequestHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/request/ReportDispatchResultPostHttpRequestHandler.java similarity index 88% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/request/ReportDispatchResultPostHttpRequestHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/request/ReportDispatchResultPostHttpRequestHandler.java index 13bb255a..c4a57046 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/request/ReportDispatchResultPostHttpRequestHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/request/ReportDispatchResultPostHttpRequestHandler.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.handler.request; +package com.aizuda.easy.retry.server.job.task.support.request; import cn.hutool.core.net.url.UrlQuery; import com.aizuda.easy.retry.client.model.request.DispatchJobResultRequest; @@ -8,10 +8,10 @@ import com.aizuda.easy.retry.common.core.model.EasyRetryRequest; import com.aizuda.easy.retry.common.core.model.NettyResult; import com.aizuda.easy.retry.common.core.util.JsonUtil; import com.aizuda.easy.retry.server.common.handler.PostHttpRequestHandler; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; -import com.aizuda.easy.retry.server.job.task.handler.callback.ClientCallbackContext; -import com.aizuda.easy.retry.server.job.task.handler.callback.ClientCallbackFactory; -import com.aizuda.easy.retry.server.job.task.handler.callback.ClientCallbackHandler; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.callback.ClientCallbackContext; +import com.aizuda.easy.retry.server.job.task.support.callback.ClientCallbackFactory; +import com.aizuda.easy.retry.server.job.task.support.ClientCallbackHandler; import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpMethod; import lombok.extern.slf4j.Slf4j; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/AbstractJobTaskStopHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/AbstractJobTaskStopHandler.java similarity index 91% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/AbstractJobTaskStopHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/AbstractJobTaskStopHandler.java index f6da700a..ab67c716 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/AbstractJobTaskStopHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/AbstractJobTaskStopHandler.java @@ -1,10 +1,11 @@ -package com.aizuda.easy.retry.server.job.task.handler.stop; +package com.aizuda.easy.retry.server.job.task.support.stop; import akka.actor.ActorRef; import com.aizuda.easy.retry.common.core.enums.JobTaskStatusEnum; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.JobExecutorResultDTO; +import com.aizuda.easy.retry.server.job.task.support.JobTaskStopHandler; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/BroadcastTaskStopHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/BroadcastTaskStopHandler.java similarity index 77% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/BroadcastTaskStopHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/BroadcastTaskStopHandler.java index daefe320..d3aad3d5 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/BroadcastTaskStopHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/BroadcastTaskStopHandler.java @@ -1,15 +1,12 @@ -package com.aizuda.easy.retry.server.job.task.handler.stop; +package com.aizuda.easy.retry.server.job.task.support.stop; import akka.actor.ActorRef; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.common.handler.ClientNodeAllocateHandler; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.RealStopTaskInstanceDTO; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; -import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/ClusterTaskStopHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ClusterTaskStopHandler.java similarity index 66% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/ClusterTaskStopHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ClusterTaskStopHandler.java index 13a6b356..fe90d173 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/ClusterTaskStopHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ClusterTaskStopHandler.java @@ -1,19 +1,12 @@ -package com.aizuda.easy.retry.server.job.task.handler.stop; +package com.aizuda.easy.retry.server.job.task.support.stop; import akka.actor.ActorRef; -import cn.hutool.core.lang.Assert; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; -import com.aizuda.easy.retry.server.common.handler.ClientNodeAllocateHandler; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.RealStopTaskInstanceDTO; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; -import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.List; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/JobTaskStopFactory.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/JobTaskStopFactory.java similarity index 82% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/JobTaskStopFactory.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/JobTaskStopFactory.java index eedf410d..7bedda2e 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/JobTaskStopFactory.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/JobTaskStopFactory.java @@ -1,6 +1,7 @@ -package com.aizuda.easy.retry.server.job.task.handler.stop; +package com.aizuda.easy.retry.server.job.task.support.stop; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; +import com.aizuda.easy.retry.server.job.task.support.JobTaskStopHandler; import java.util.concurrent.ConcurrentHashMap; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/RealStopTaskActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/RealStopTaskActor.java similarity index 97% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/RealStopTaskActor.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/RealStopTaskActor.java index 728a86ed..76e85d07 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/RealStopTaskActor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/RealStopTaskActor.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.handler.stop; +package com.aizuda.easy.retry.server.job.task.support.stop; import akka.actor.AbstractActor; import com.aizuda.easy.retry.client.model.StopJobDTO; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/ShardingTaskStopHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ShardingTaskStopHandler.java similarity index 89% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/ShardingTaskStopHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ShardingTaskStopHandler.java index caa50b66..a6bb2831 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/ShardingTaskStopHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/ShardingTaskStopHandler.java @@ -1,8 +1,8 @@ -package com.aizuda.easy.retry.server.job.task.handler.stop; +package com.aizuda.easy.retry.server.job.task.support.stop; import akka.actor.ActorRef; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; import com.aizuda.easy.retry.server.job.task.dto.RealStopTaskInstanceDTO; import com.aizuda.easy.retry.server.job.task.enums.TaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/TaskStopJobContext.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/TaskStopJobContext.java similarity index 92% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/TaskStopJobContext.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/TaskStopJobContext.java index 49197fe2..bda362b5 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/stop/TaskStopJobContext.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/stop/TaskStopJobContext.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.handler.stop; +package com.aizuda.easy.retry.server.job.task.support.stop; import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; import lombok.Data; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/strategy/BlockStrategies.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/strategy/BlockStrategies.java similarity index 85% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/strategy/BlockStrategies.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/strategy/BlockStrategies.java index 3e647293..97f0c22e 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/strategy/BlockStrategies.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/strategy/BlockStrategies.java @@ -1,14 +1,14 @@ -package com.aizuda.easy.retry.server.job.task.strategy; +package com.aizuda.easy.retry.server.job.task.support.strategy; import com.aizuda.easy.retry.common.core.context.SpringContext; import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; -import com.aizuda.easy.retry.server.job.task.BlockStrategy; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; -import com.aizuda.easy.retry.server.job.task.generator.batch.JobTaskBatchGenerator; -import com.aizuda.easy.retry.server.job.task.generator.batch.JobTaskBatchGeneratorContext; -import com.aizuda.easy.retry.server.job.task.handler.stop.JobTaskStopHandler; -import com.aizuda.easy.retry.server.job.task.handler.stop.JobTaskStopFactory; -import com.aizuda.easy.retry.server.job.task.handler.stop.TaskStopJobContext; +import com.aizuda.easy.retry.server.job.task.support.BlockStrategy; +import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter; +import com.aizuda.easy.retry.server.job.task.support.generator.batch.JobTaskBatchGenerator; +import com.aizuda.easy.retry.server.job.task.support.generator.batch.JobTaskBatchGeneratorContext; +import com.aizuda.easy.retry.server.job.task.support.stop.JobTaskStopFactory; +import com.aizuda.easy.retry.server.job.task.support.JobTaskStopHandler; +import com.aizuda.easy.retry.server.job.task.support.stop.TaskStopJobContext; import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/strategy/WaitStrategies.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/strategy/WaitStrategies.java similarity index 87% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/strategy/WaitStrategies.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/strategy/WaitStrategies.java index f4c4b85b..83f48e87 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/strategy/WaitStrategies.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/strategy/WaitStrategies.java @@ -1,14 +1,8 @@ -package com.aizuda.easy.retry.server.job.task.strategy; +package com.aizuda.easy.retry.server.job.task.support.strategy; -import com.aizuda.easy.retry.common.core.context.SpringContext; import com.aizuda.easy.retry.common.core.util.CronExpression; -import com.aizuda.easy.retry.server.common.config.SystemProperties; -import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum; import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; -import com.aizuda.easy.retry.server.job.task.WaitStrategy; -import com.aizuda.easy.retry.template.datasource.access.AccessTemplate; -import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask; -import com.aizuda.easy.retry.template.datasource.persistence.po.SceneConfig; +import com.aizuda.easy.retry.server.job.task.support.WaitStrategy; import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/timer/JobTimerTask.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerTask.java similarity index 90% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/timer/JobTimerTask.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerTask.java index 8581273d..a6faea75 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/timer/JobTimerTask.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerTask.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.handler.timer; +package com.aizuda.easy.retry.server.job.task.support.timer; import akka.actor.ActorRef; import cn.hutool.core.lang.Assert; @@ -8,13 +8,8 @@ import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum; import com.aizuda.easy.retry.common.core.enums.StatusEnum; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; -import com.aizuda.easy.retry.server.job.task.JobTaskConverter; -import com.aizuda.easy.retry.server.job.task.WaitStrategy; -import com.aizuda.easy.retry.server.job.task.dto.JobTaskPrepareDTO; import com.aizuda.easy.retry.server.job.task.dto.JobTimerTaskDTO; import com.aizuda.easy.retry.server.job.task.dto.TaskExecuteDTO; -import com.aizuda.easy.retry.server.job.task.strategy.WaitStrategies.WaitStrategyContext; -import com.aizuda.easy.retry.server.job.task.strategy.WaitStrategies.WaitStrategyEnum; 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; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/timer/JobTimerWheelHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerWheelHandler.java similarity index 98% rename from easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/timer/JobTimerWheelHandler.java rename to easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerWheelHandler.java index 75acedbc..6eb2e54a 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/handler/timer/JobTimerWheelHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerWheelHandler.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.job.task.handler.timer; +package com.aizuda.easy.retry.server.job.task.support.timer; import cn.hutool.core.util.StrUtil; import com.aizuda.easy.retry.common.core.log.LogUtils; diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/resources/META-INF/spring.factories b/easy-retry-server/easy-retry-server-job-task/src/main/resources/META-INF/spring.factories index 4324832c..d7880cce 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/resources/META-INF/spring.factories +++ b/easy-retry-server/easy-retry-server-job-task/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.aizuda.easy.retry.server.job.task.config.EasyRetryServerRetryJobAutoConfiguration + com.aizuda.easy.retry.server.job.task.EasyRetryJobTaskStarter diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/config/EasyRetryServerRetryTaskAutoConfiguration.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/EasyRetryRetryTaskStarter.java similarity index 59% rename from easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/config/EasyRetryServerRetryTaskAutoConfiguration.java rename to easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/EasyRetryRetryTaskStarter.java index 4566f2d0..6d9e76e9 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/config/EasyRetryServerRetryTaskAutoConfiguration.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/EasyRetryRetryTaskStarter.java @@ -1,16 +1,15 @@ -package com.aizuda.easy.retry.server.retry.task.config; +package com.aizuda.easy.retry.server.retry.task; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; /** - * web访问模块 - * * @author: www.byteblogs.com - * @date : 2023-09-19 09:21 + * @date : 2023-10-12 08:54 + * @since : 2.4.0 */ @Configuration @ComponentScan("com.aizuda.easy.retry.server.retry.task.*") -public class EasyRetryServerRetryTaskAutoConfiguration { +public class EasyRetryRetryTaskStarter { } diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/result/FailureActor.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/result/FailureActor.java index 6ff02cea..804ed3ee 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/result/FailureActor.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/result/FailureActor.java @@ -9,12 +9,12 @@ import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.common.config.SystemProperties; import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum; import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.actor.CallbackTimerTask; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.actor.RetryTimerContext; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.actor.RetryTimerTask; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.actor.TimerWheelHandler; +import com.aizuda.easy.retry.server.retry.task.support.timer.CallbackTimerTask; +import com.aizuda.easy.retry.server.retry.task.support.timer.RetryTimerContext; +import com.aizuda.easy.retry.server.retry.task.support.timer.RetryTimerTask; +import com.aizuda.easy.retry.server.retry.task.support.timer.TimerWheelHandler; import com.aizuda.easy.retry.server.retry.task.support.dispatch.actor.log.RetryTaskLogDTO; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskActuatorSceneEnum; +import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskExecutorSceneEnum; import com.aizuda.easy.retry.server.retry.task.support.handler.CallbackRetryTaskHandler; import com.aizuda.easy.retry.template.datasource.access.AccessTemplate; import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask; @@ -77,11 +77,11 @@ public class FailureActor extends AbstractActor { if (TaskTypeEnum.CALLBACK.getType().equals(retryTask.getTaskType())) { maxRetryCount = systemProperties.getCallback().getMaxCount(); timerTask = new CallbackTimerTask(); - timerContext.setScene(TaskActuatorSceneEnum.AUTO_CALLBACK); + timerContext.setScene(TaskExecutorSceneEnum.AUTO_CALLBACK); } else { maxRetryCount = sceneConfig.getMaxRetryCount(); timerTask = new RetryTimerTask(timerContext); - timerContext.setScene(TaskActuatorSceneEnum.AUTO_RETRY); + timerContext.setScene(TaskExecutorSceneEnum.AUTO_RETRY); } if (maxRetryCount <= retryTask.getRetryCount()) { 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 86881123..242e7b3f 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 @@ -7,9 +7,9 @@ import com.aizuda.easy.retry.server.common.config.SystemProperties; import com.aizuda.easy.retry.server.retry.task.support.IdempotentStrategy; import com.aizuda.easy.retry.server.common.dto.ScanTask; import com.aizuda.easy.retry.server.common.handler.ClientNodeAllocateHandler; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.actor.TimerWheelHandler; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskActuator; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskActuatorSceneEnum; +import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskExecutor; +import com.aizuda.easy.retry.server.retry.task.support.timer.TimerWheelHandler; +import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskExecutorSceneEnum; import com.aizuda.easy.retry.template.datasource.access.AccessTemplate; import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -43,7 +43,7 @@ public abstract class AbstractScanGroup extends AbstractActor { @Autowired protected ClientNodeAllocateHandler clientNodeAllocateHandler; @Autowired - protected List taskActuators; + protected List taskExecutors; @Override public Receive createReceive() { @@ -81,9 +81,9 @@ public abstract class AbstractScanGroup extends AbstractActor { continue; } - for (TaskActuator taskActuator : taskActuators) { - if (taskActuatorScene().getScene() == taskActuator.getTaskType().getScene()) { - taskActuator.actuator(retryTask); + for (TaskExecutor taskExecutor : taskExecutors) { + if (taskActuatorScene().getScene() == taskExecutor.getTaskType().getScene()) { + taskExecutor.actuator(retryTask); } } } @@ -100,7 +100,7 @@ public abstract class AbstractScanGroup extends AbstractActor { } - protected abstract TaskActuatorSceneEnum taskActuatorScene(); + protected abstract TaskExecutorSceneEnum taskActuatorScene(); protected abstract Long getLastId(String groupName); 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/ScanCallbackTaskActor.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/scan/ScanCallbackTaskActor.java index fa657330..93c8c74f 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/scan/ScanCallbackTaskActor.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/scan/ScanCallbackTaskActor.java @@ -1,19 +1,9 @@ package com.aizuda.easy.retry.server.retry.task.support.dispatch.actor.scan; -import akka.actor.ActorRef; -import com.aizuda.easy.retry.common.core.model.Result; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum; -import com.aizuda.easy.retry.server.retry.task.support.RetryContext; import com.aizuda.easy.retry.server.retry.task.support.WaitStrategy; -import com.aizuda.easy.retry.server.retry.task.support.context.CallbackRetryContext; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskActuatorSceneEnum; -import com.aizuda.easy.retry.server.retry.task.support.retry.RetryBuilder; -import com.aizuda.easy.retry.server.retry.task.support.retry.RetryExecutor; -import com.aizuda.easy.retry.server.retry.task.support.strategy.FilterStrategies; -import com.aizuda.easy.retry.server.retry.task.support.strategy.StopStrategies; +import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskExecutorSceneEnum; import com.aizuda.easy.retry.server.retry.task.support.strategy.WaitStrategies; -import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.Scope; @@ -42,8 +32,8 @@ public class ScanCallbackTaskActor extends AbstractScanGroup { private static final ConcurrentMap LAST_AT_MAP = new ConcurrentHashMap<>(); @Override - protected TaskActuatorSceneEnum taskActuatorScene() { - return TaskActuatorSceneEnum.AUTO_CALLBACK; + protected TaskExecutorSceneEnum taskActuatorScene() { + return TaskExecutorSceneEnum.AUTO_CALLBACK; } @Override 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/ScanRetryTaskActor.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/scan/ScanRetryTaskActor.java index 9e4dbe71..172f8b00 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/scan/ScanRetryTaskActor.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/scan/ScanRetryTaskActor.java @@ -1,21 +1,7 @@ package com.aizuda.easy.retry.server.retry.task.support.dispatch.actor.scan; -import akka.actor.ActorRef; -import com.aizuda.easy.retry.client.model.DispatchRetryResultDTO; -import com.aizuda.easy.retry.common.core.model.Result; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum; -import com.aizuda.easy.retry.server.retry.task.support.RetryContext; -import com.aizuda.easy.retry.server.retry.task.support.WaitStrategy; -import com.aizuda.easy.retry.server.retry.task.support.context.MaxAttemptsPersistenceRetryContext; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskActuatorSceneEnum; -import com.aizuda.easy.retry.server.retry.task.support.retry.RetryBuilder; -import com.aizuda.easy.retry.server.retry.task.support.retry.RetryExecutor; -import com.aizuda.easy.retry.server.retry.task.support.strategy.FilterStrategies; -import com.aizuda.easy.retry.server.retry.task.support.strategy.StopStrategies; -import com.aizuda.easy.retry.server.retry.task.support.strategy.WaitStrategies; -import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask; -import com.aizuda.easy.retry.template.datasource.persistence.po.SceneConfig; +import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskExecutorSceneEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.Scope; @@ -42,8 +28,8 @@ public class ScanRetryTaskActor extends AbstractScanGroup { private static final ConcurrentMap LAST_AT_MAP = new ConcurrentHashMap<>(); @Override - protected TaskActuatorSceneEnum taskActuatorScene() { - return TaskActuatorSceneEnum.AUTO_RETRY; + protected TaskExecutorSceneEnum taskActuatorScene() { + return TaskExecutorSceneEnum.AUTO_RETRY; } @Override diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/AbstractTaskActuator.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/AbstractTaskExecutor.java similarity index 93% rename from easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/AbstractTaskActuator.java rename to easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/AbstractTaskExecutor.java index 6f3a4784..74020275 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/AbstractTaskActuator.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/AbstractTaskExecutor.java @@ -6,18 +6,14 @@ import com.aizuda.easy.retry.server.common.config.SystemProperties; import com.aizuda.easy.retry.server.common.handler.ClientNodeAllocateHandler; import com.aizuda.easy.retry.server.retry.task.support.IdempotentStrategy; import com.aizuda.easy.retry.server.retry.task.support.RetryContext; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.actor.TimerWheelHandler; import com.aizuda.easy.retry.server.retry.task.support.retry.RetryExecutor; import com.aizuda.easy.retry.template.datasource.access.AccessTemplate; import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask; -import io.netty.util.Timeout; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import java.util.Objects; - /** * * @@ -26,7 +22,7 @@ import java.util.Objects; * @since 2.4.0 */ @Slf4j -public abstract class AbstractTaskActuator implements TaskActuator, InitializingBean { +public abstract class AbstractTaskExecutor implements TaskExecutor, InitializingBean { @Autowired @Qualifier("bitSetIdempotentStrategyHandler") diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/CallbackTaskActuator.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/CallbackTaskExecutor.java similarity index 92% rename from easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/CallbackTaskActuator.java rename to easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/CallbackTaskExecutor.java index 567ddc17..665f3f5d 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/CallbackTaskActuator.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/CallbackTaskExecutor.java @@ -3,7 +3,6 @@ package com.aizuda.easy.retry.server.retry.task.support.dispatch.task; import akka.actor.ActorRef; import com.aizuda.easy.retry.common.core.model.Result; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum; import com.aizuda.easy.retry.server.retry.task.support.RetryContext; import com.aizuda.easy.retry.server.retry.task.support.WaitStrategy; import com.aizuda.easy.retry.server.retry.task.support.context.CallbackRetryContext; @@ -23,7 +22,7 @@ import org.springframework.stereotype.Component; * @since 2.4.0 */ @Component -public class CallbackTaskActuator extends AbstractTaskActuator { +public class CallbackTaskExecutor extends AbstractTaskExecutor { @Override protected RetryContext builderRetryContext(final String groupName, final RetryTask retryTask) { @@ -52,8 +51,8 @@ public class CallbackTaskActuator extends AbstractTaskActuator { } @Override - public TaskActuatorSceneEnum getTaskType() { - return TaskActuatorSceneEnum.AUTO_CALLBACK; + public TaskExecutorSceneEnum getTaskType() { + return TaskExecutorSceneEnum.AUTO_CALLBACK; } private WaitStrategy getWaitWaitStrategy() { diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/ManualCallbackTaskActuator.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/ManualCallbackTaskExecutor.java similarity index 94% rename from easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/ManualCallbackTaskActuator.java rename to easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/ManualCallbackTaskExecutor.java index f552ca7b..cc2a733c 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/ManualCallbackTaskActuator.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/ManualCallbackTaskExecutor.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Component; * @since 2.4.0 */ @Component -public class ManualCallbackTaskActuator extends AbstractTaskActuator { +public class ManualCallbackTaskExecutor extends AbstractTaskExecutor { @Override protected RetryContext builderRetryContext(final String groupName, final RetryTask retryTask) { @@ -61,8 +61,8 @@ public class ManualCallbackTaskActuator extends AbstractTaskActuator { } @Override - public TaskActuatorSceneEnum getTaskType() { - return TaskActuatorSceneEnum.MANUAL_CALLBACK; + public TaskExecutorSceneEnum getTaskType() { + return TaskExecutorSceneEnum.MANUAL_CALLBACK; } private WaitStrategy getWaitWaitStrategy() { diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/ManualRetryTaskActuator.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/ManualRetryTaskExecutor.java similarity index 95% rename from easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/ManualRetryTaskActuator.java rename to easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/ManualRetryTaskExecutor.java index 560d6f59..8ab906e6 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/ManualRetryTaskActuator.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/ManualRetryTaskExecutor.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Component; * @since 2.4.0 */ @Component -public class ManualRetryTaskActuator extends AbstractTaskActuator { +public class ManualRetryTaskExecutor extends AbstractTaskExecutor { @Override protected RetryContext> builderRetryContext(final String groupName, @@ -56,8 +56,8 @@ public class ManualRetryTaskActuator extends AbstractTaskActuator { } @Override - public TaskActuatorSceneEnum getTaskType() { - return TaskActuatorSceneEnum.MANUAL_RETRY; + public TaskExecutorSceneEnum getTaskType() { + return TaskExecutorSceneEnum.MANUAL_RETRY; } private WaitStrategy getWaitWaitStrategy(String groupName, String sceneName) { diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/RetryTaskActuator.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/RetryTaskExecutor.java similarity index 93% rename from easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/RetryTaskActuator.java rename to easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/RetryTaskExecutor.java index e74b514a..9d362af7 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/RetryTaskActuator.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/RetryTaskExecutor.java @@ -4,7 +4,6 @@ import akka.actor.ActorRef; import com.aizuda.easy.retry.client.model.DispatchRetryResultDTO; import com.aizuda.easy.retry.common.core.model.Result; import com.aizuda.easy.retry.server.common.akka.ActorGenerator; -import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum; import com.aizuda.easy.retry.server.retry.task.support.RetryContext; import com.aizuda.easy.retry.server.retry.task.support.WaitStrategy; import com.aizuda.easy.retry.server.retry.task.support.context.MaxAttemptsPersistenceRetryContext; @@ -25,7 +24,7 @@ import org.springframework.stereotype.Component; * @since 2.4.0 */ @Component -public class RetryTaskActuator extends AbstractTaskActuator { +public class RetryTaskExecutor extends AbstractTaskExecutor { @Override protected RetryContext> builderRetryContext(final String groupName, @@ -56,8 +55,8 @@ public class RetryTaskActuator extends AbstractTaskActuator { } @Override - public TaskActuatorSceneEnum getTaskType() { - return TaskActuatorSceneEnum.AUTO_RETRY; + public TaskExecutorSceneEnum getTaskType() { + return TaskExecutorSceneEnum.AUTO_RETRY; } private WaitStrategy getWaitWaitStrategy(String groupName, String sceneName) { diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskActuatorFactory.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskActuatorFactory.java index 3812d324..22977cd6 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskActuatorFactory.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskActuatorFactory.java @@ -1,7 +1,5 @@ package com.aizuda.easy.retry.server.retry.task.support.dispatch.task; -import com.aizuda.easy.retry.template.datasource.access.Access; - import java.util.HashMap; import java.util.Map; @@ -12,13 +10,13 @@ import java.util.Map; */ public class TaskActuatorFactory { - private static final Map REGISTER_TASK_ACTUATOR = new HashMap<>(); + private static final Map REGISTER_TASK_ACTUATOR = new HashMap<>(); - protected static void register(TaskActuatorSceneEnum scene,TaskActuator taskActuator) { - REGISTER_TASK_ACTUATOR.put(scene, taskActuator); + protected static void register(TaskExecutorSceneEnum scene, TaskExecutor taskExecutor) { + REGISTER_TASK_ACTUATOR.put(scene, taskExecutor); } - public static TaskActuator getTaskActuator(TaskActuatorSceneEnum scene) { + public static TaskExecutor getTaskActuator(TaskExecutorSceneEnum scene) { return REGISTER_TASK_ACTUATOR.get(scene); } diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskActuator.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskExecutor.java similarity index 66% rename from easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskActuator.java rename to easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskExecutor.java index a22c90f4..5e3bd373 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskActuator.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskExecutor.java @@ -1,6 +1,5 @@ package com.aizuda.easy.retry.server.retry.task.support.dispatch.task; -import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum; import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask; /** @@ -8,9 +7,9 @@ import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask; * @date 2023-09-23 08:01:38 * @since 2.4.0 */ -public interface TaskActuator { +public interface TaskExecutor { - TaskActuatorSceneEnum getTaskType(); + TaskExecutorSceneEnum getTaskType(); void actuator(RetryTask retryTask); } diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskActuatorSceneEnum.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskExecutorSceneEnum.java similarity index 93% rename from easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskActuatorSceneEnum.java rename to easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskExecutorSceneEnum.java index 0c9ced1e..476c1ebf 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskActuatorSceneEnum.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskExecutorSceneEnum.java @@ -11,7 +11,7 @@ import lombok.Getter; */ @AllArgsConstructor @Getter -public enum TaskActuatorSceneEnum { +public enum TaskExecutorSceneEnum { AUTO_RETRY(1, TaskTypeEnum.RETRY), MANUAL_RETRY(2, TaskTypeEnum.RETRY), AUTO_CALLBACK(3, TaskTypeEnum.CALLBACK), diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/AbstractTimerTask.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/AbstractTimerTask.java similarity index 88% rename from easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/AbstractTimerTask.java rename to easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/AbstractTimerTask.java index 8ce0c47b..16246a14 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/AbstractTimerTask.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/AbstractTimerTask.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.retry.task.support.dispatch.actor; +package com.aizuda.easy.retry.server.retry.task.support.timer; import io.netty.util.Timeout; import io.netty.util.TimerTask; diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/CallbackTimerTask.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/CallbackTimerTask.java similarity index 82% rename from easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/CallbackTimerTask.java rename to easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/CallbackTimerTask.java index 84a025b5..39b65c89 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/CallbackTimerTask.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/CallbackTimerTask.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.retry.task.support.dispatch.actor; +package com.aizuda.easy.retry.server.retry.task.support.timer; import io.netty.util.Timeout; import io.netty.util.TimerTask; diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/RetryTimerContext.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/RetryTimerContext.java similarity index 65% rename from easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/RetryTimerContext.java rename to easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/RetryTimerContext.java index 04b5dfbb..24282ae7 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/RetryTimerContext.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/RetryTimerContext.java @@ -1,6 +1,6 @@ -package com.aizuda.easy.retry.server.retry.task.support.dispatch.actor; +package com.aizuda.easy.retry.server.retry.task.support.timer; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskActuatorSceneEnum; +import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskExecutorSceneEnum; import lombok.Data; /** @@ -15,6 +15,6 @@ public class RetryTimerContext { private String uniqueId; - private TaskActuatorSceneEnum scene; + private TaskExecutorSceneEnum scene; } diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/RetryTimerTask.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/RetryTimerTask.java similarity index 78% rename from easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/RetryTimerTask.java rename to easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/RetryTimerTask.java index 8ce2215b..e214e090 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/RetryTimerTask.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/RetryTimerTask.java @@ -1,23 +1,18 @@ -package com.aizuda.easy.retry.server.retry.task.support.dispatch.actor; +package com.aizuda.easy.retry.server.retry.task.support.timer; import com.aizuda.easy.retry.common.core.context.SpringContext; import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskActuator; +import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskExecutor; import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskActuatorFactory; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskActuatorSceneEnum; -import com.aizuda.easy.retry.server.retry.task.support.retry.RetryExecutor; import com.aizuda.easy.retry.template.datasource.access.AccessTemplate; import com.aizuda.easy.retry.template.datasource.access.TaskAccess; import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.netty.util.Timeout; -import io.netty.util.TimerTask; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import java.time.LocalDateTime; -import java.util.List; /** * @author: www.byteblogs.com @@ -45,7 +40,7 @@ public class RetryTimerTask extends AbstractTimerTask { .eq(RetryTask::getGroupName, context.getGroupName()) .eq(RetryTask::getUniqueId, context.getUniqueId()) .eq(RetryTask::getRetryStatus, RetryStatusEnum.RUNNING.getStatus())); - TaskActuator taskActuator = TaskActuatorFactory.getTaskActuator(context.getScene()); - taskActuator.actuator(retryTask); + TaskExecutor taskExecutor = TaskActuatorFactory.getTaskActuator(context.getScene()); + taskExecutor.actuator(retryTask); } } diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/TimerWheelHandler.java b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/TimerWheelHandler.java similarity index 97% rename from easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/TimerWheelHandler.java rename to easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/TimerWheelHandler.java index 28ac12af..20c079c8 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/TimerWheelHandler.java +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/timer/TimerWheelHandler.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.server.retry.task.support.dispatch.actor; +package com.aizuda.easy.retry.server.retry.task.support.timer; import cn.hutool.core.util.StrUtil; import com.aizuda.easy.retry.common.core.log.LogUtils; diff --git a/easy-retry-server/easy-retry-server-retry-task/src/main/resources/META-INF/spring.factories b/easy-retry-server/easy-retry-server-retry-task/src/main/resources/META-INF/spring.factories index c2a80ad7..8ee06e51 100644 --- a/easy-retry-server/easy-retry-server-retry-task/src/main/resources/META-INF/spring.factories +++ b/easy-retry-server/easy-retry-server-retry-task/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.aizuda.easy.retry.server.retry.task.config.EasyRetryServerRetryTaskAutoConfiguration + com.aizuda.easy.retry.server.retry.task.EasyRetryRetryTaskStarter diff --git a/easy-retry-server/easy-retry-server-starter/src/main/java/com/aizuda/easy/retry/server/dispatch/DispatchService.java b/easy-retry-server/easy-retry-server-starter/src/main/java/com/aizuda/easy/retry/server/dispatch/DispatchService.java index 0ba4746c..48d1172c 100644 --- a/easy-retry-server/easy-retry-server-starter/src/main/java/com/aizuda/easy/retry/server/dispatch/DispatchService.java +++ b/easy-retry-server/easy-retry-server-starter/src/main/java/com/aizuda/easy/retry/server/dispatch/DispatchService.java @@ -58,7 +58,7 @@ public class DispatchService implements Lifecycle { } Set currentConsumerBuckets = getConsumerBucket(); - LogUtils.info(log, "当前节点分配的桶:[{}]", currentConsumerBuckets); +// LogUtils.info(log, "当前节点分配的桶:[{}]", currentConsumerBuckets); if (!CollectionUtils.isEmpty(currentConsumerBuckets)) { ConsumerBucket scanTaskDTO = new ConsumerBucket(); scanTaskDTO.setBuckets(currentConsumerBuckets); diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/config/EasyRetryServerWebAutoConfiguration.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/EasyRetryWebStarter.java similarity index 60% rename from easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/config/EasyRetryServerWebAutoConfiguration.java rename to easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/EasyRetryWebStarter.java index 27eeda81..70277858 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/config/EasyRetryServerWebAutoConfiguration.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/EasyRetryWebStarter.java @@ -1,16 +1,15 @@ -package com.aizuda.easy.retry.server.web.config; +package com.aizuda.easy.retry.server.web; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; /** - * web访问模块 - * * @author: www.byteblogs.com - * @date : 2023-09-19 09:21 + * @date : 2023-10-12 09:01 + * @since : 2.4.0 */ @Configuration @ComponentScan("com.aizuda.easy.retry.server.web.*") -public class EasyRetryServerWebAutoConfiguration { +public class EasyRetryWebStarter { } diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobBatchController.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobBatchController.java new file mode 100644 index 00000000..d782dc49 --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobBatchController.java @@ -0,0 +1,43 @@ +package com.aizuda.easy.retry.server.web.controller; + +import com.aizuda.easy.retry.server.web.annotation.LoginRequired; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.JobBatchQueryVO; +import com.aizuda.easy.retry.server.web.model.request.JobQueryVO; +import com.aizuda.easy.retry.server.web.model.response.JobBatchResponseVO; +import com.aizuda.easy.retry.server.web.model.response.JobResponseVO; +import com.aizuda.easy.retry.server.web.service.JobBatchService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 09:52 + * @since ： 2.4.0 + */ +@RestController +@RequestMapping("/job/batch") +public class JobBatchController { + + @Autowired + private JobBatchService jobBatchService; + + @GetMapping("/list") + @LoginRequired + public PageResult> getJobBatchPage(JobBatchQueryVO jobQueryVO) { + return jobBatchService.getJobBatchPage(jobQueryVO); + } + + @GetMapping("{id}") + @LoginRequired + public JobBatchResponseVO getJobBatchDetail(@PathVariable("id") Long id) { + return jobBatchService.getJobBatchDetail(id); + } + + +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobController.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobController.java index bf8728e8..141bdb7a 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobController.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobController.java @@ -5,10 +5,15 @@ import com.aizuda.easy.retry.server.web.model.base.PageResult; import com.aizuda.easy.retry.server.web.model.request.JobQueryVO; import com.aizuda.easy.retry.server.web.model.request.JobRequestVO; import com.aizuda.easy.retry.server.web.model.response.JobResponseVO; -import com.aizuda.easy.retry.server.web.model.response.SceneConfigResponseVO; import com.aizuda.easy.retry.server.web.service.JobService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -32,19 +37,19 @@ public class JobController { @GetMapping("{id}") @LoginRequired - public PageResult> getJobDetail(@PathVariable("id") Long id) { + public JobResponseVO getJobDetail(@PathVariable("id") Long id) { return jobService.getJobDetail(id); } @PostMapping @LoginRequired - public PageResult> saveJob(@RequestBody JobRequestVO jobRequestVO) { + public Boolean saveJob(@RequestBody JobRequestVO jobRequestVO) { return jobService.saveJob(jobRequestVO); } @PutMapping @LoginRequired - public PageResult> updateJob(@RequestBody JobRequestVO jobRequestVO) { + public Boolean updateJob(@RequestBody JobRequestVO jobRequestVO) { return jobService.updateJob(jobRequestVO); } diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobLogController.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobLogController.java new file mode 100644 index 00000000..a9890c3e --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobLogController.java @@ -0,0 +1,33 @@ +package com.aizuda.easy.retry.server.web.controller; + +import com.aizuda.easy.retry.server.web.annotation.LoginRequired; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.JobLogQueryVO; +import com.aizuda.easy.retry.server.web.model.response.JobLogResponseVO; +import com.aizuda.easy.retry.server.web.service.JobLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 09:56 + * @since ： 2.4.0 + */ +@RestController +@RequestMapping("/job/log") +public class JobLogController { + + @Autowired + private JobLogService jobLogService; + + @GetMapping("/list") + @LoginRequired + public PageResult> getJobLogPage(JobLogQueryVO jobQueryVO) { + return jobLogService.getJobLogPage(jobQueryVO); + } + +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobTaskController.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobTaskController.java new file mode 100644 index 00000000..266eacbe --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/controller/JobTaskController.java @@ -0,0 +1,33 @@ +package com.aizuda.easy.retry.server.web.controller; + +import com.aizuda.easy.retry.server.web.annotation.LoginRequired; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.JobTaskQueryVO; +import com.aizuda.easy.retry.server.web.model.response.JobTaskResponseVO; +import com.aizuda.easy.retry.server.web.service.JobTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 09:55 + * @since ： 2.4.0 + */ +@RestController +@RequestMapping("/job/task") +public class JobTaskController { + + @Autowired + private JobTaskService jobTaskService; + + @GetMapping("/list") + @LoginRequired + public PageResult> getJobTaskPage(JobTaskQueryVO jobTaskQueryVO) { + return jobTaskService.getJobTaskPage(jobTaskQueryVO); + } + +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobBatchQueryVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobBatchQueryVO.java new file mode 100644 index 00000000..d5aff40b --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobBatchQueryVO.java @@ -0,0 +1,16 @@ +package com.aizuda.easy.retry.server.web.model.request; + +import com.aizuda.easy.retry.server.web.model.base.BaseQueryVO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author www.byteblogs.com + * @date 2023-10-11 22:28:07 + * @since 2.4.0 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class JobBatchQueryVO extends BaseQueryVO { + private Long jobId ; +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobLogQueryVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobLogQueryVO.java new file mode 100644 index 00000000..88c36c32 --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobLogQueryVO.java @@ -0,0 +1,17 @@ +package com.aizuda.easy.retry.server.web.model.request; + +import com.aizuda.easy.retry.server.web.model.base.BaseQueryVO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author www.byteblogs.com + * @date 2023-10-11 22:28:07 + * @since 2.4.0 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class JobLogQueryVO extends BaseQueryVO { + private Long jobId; + private Long taskBatchId; +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobQueryVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobQueryVO.java index a38dda1e..43972446 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobQueryVO.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobQueryVO.java @@ -1,11 +1,17 @@ package com.aizuda.easy.retry.server.web.model.request; import com.aizuda.easy.retry.server.web.model.base.BaseQueryVO; +import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author www.byteblogs.com * @date 2023-10-11 22:28:07 * @since 2.4.0 */ +@EqualsAndHashCode(callSuper = true) +@Data public class JobQueryVO extends BaseQueryVO { + private String groupName; + private String jobName; } diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobRequestVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobRequestVO.java index a4fe6194..7114a463 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobRequestVO.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobRequestVO.java @@ -2,6 +2,10 @@ package com.aizuda.easy.retry.server.web.model.request; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; + /** * @author www.byteblogs.com * @date 2023-10-11 22:37:55 @@ -9,4 +13,102 @@ import lombok.Data; */ @Data public class JobRequestVO { + + private Long id; + + /** + * 组名称 + */ + @NotBlank(message = "groupName 不能为空") + @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + private String groupName; + + /** + * 名称 + */ + @NotBlank(message = "jobName 不能为空") + private String jobName; + + /** + * 执行方法参数 + */ + private String argsStr; + + /** + * 参数类型 text/json + */ + @NotNull(message = "argsType 不能为空") + private Integer argsType; + + /** + * 执行器路由策略 + */ + @NotNull(message = "routeKey 不能为空") + private String routeKey; + + /** + * 执行器类型 1、Java + */ + @NotNull(message = "executorType 不能为空") + private Integer executorType; + + /** + * 执行器名称 + */ + @NotBlank(message = "executorName 不能为空") + private String executorName; + + /** + * 触发类型 1.CRON 表达式 2. 固定时间 + */ + @NotNull(message = "triggerType 不能为空") + private Integer triggerType; + + /** + * 间隔时长 + */ + @NotNull(message = "triggerInterval 不能为空") + private String triggerInterval; + + /** + * 阻塞策略 1、丢弃 2、覆盖 3、并行 + */ + @NotNull(message = "blockStrategy 不能为空") + private Integer blockStrategy; + + /** + * 任务执行超时时间，单位秒 + */ + @NotNull(message = "executorTimeout 不能为空") + private Integer executorTimeout; + + /** + * 最大重试次数 + */ + @NotNull(message = "maxRetryTimes 不能为空") + private Integer maxRetryTimes; + + /** + * 重试间隔(s) + */ + @NotNull(message = "retryInterval 不能为空") + private Integer retryInterval; + + /** + * 任务类型 + */ + @NotNull(message = "taskType 不能为空") + private Integer taskType; + + /** + * 并行数 + */ + @NotNull(message = "parallelNum 不能为空") + private Integer parallelNum; + + /** + * 描述 + */ + private String description; + } diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobTaskQueryVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobTaskQueryVO.java new file mode 100644 index 00000000..e779710d --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/request/JobTaskQueryVO.java @@ -0,0 +1,17 @@ +package com.aizuda.easy.retry.server.web.model.request; + +import com.aizuda.easy.retry.server.web.model.base.BaseQueryVO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author www.byteblogs.com + * @date 2023-10-11 22:28:07 + * @since 2.4.0 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class JobTaskQueryVO extends BaseQueryVO { + private Long jobId; + private Long taskBatchId; +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/JobBatchResponseVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/JobBatchResponseVO.java new file mode 100644 index 00000000..a24d32d2 --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/JobBatchResponseVO.java @@ -0,0 +1,13 @@ +package com.aizuda.easy.retry.server.web.model.response; + +import lombok.Data; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 10:18 + * @since : 2.4.0 + */ +@Data +public class JobBatchResponseVO { + +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/JobLogResponseVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/JobLogResponseVO.java new file mode 100644 index 00000000..30309af6 --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/JobLogResponseVO.java @@ -0,0 +1,52 @@ +package com.aizuda.easy.retry.server.web.model.response; + +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 11:22 + * @since : 2.4.0 + */ +@Data +public class JobLogResponseVO { + + private Long id; + + /** + * 组名称 + */ + private String groupName; + + /** + * 任务信息id + */ + private Long jobId; + + /** + * 任务实例id + */ + private Long taskBatchId; + + /** + * 调度任务id + */ + private Long taskId; + + /** + * 创建时间 + */ + private LocalDateTime createDt; + + /** + * 客户端信息 + */ + private String clientAddress; + + /** + * 调度信息 + */ + private String message; + +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/JobTaskResponseVO.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/JobTaskResponseVO.java new file mode 100644 index 00000000..c455669c --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/model/response/JobTaskResponseVO.java @@ -0,0 +1,83 @@ +package com.aizuda.easy.retry.server.web.model.response; + +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 10:18 + * @since : 2.4.0 + */ +@Data +public class JobTaskResponseVO { + + private Long id; + + /** + * 组名称 + */ + private String groupName; + + /** + * 任务信息id + */ + private Long jobId; + + /** + * 调度任务id + */ + private Long taskBatchId; + + /** + * 父执行器id + */ + private Long parentId; + + /** + * 执行的状态 0、失败 1、成功 + */ + private Integer executeStatus; + + /** + * 重试次数 + */ + private Integer retryCount; + + /** + * 执行结果 + */ + private String resultMessage; + + /** + * 客户端ID + */ + private String clientId; + + /** + * 执行方法参数 + */ + private String argsStr; + + /** + * 参数类型 text/json + */ + private String argsType; + + /** + * 扩展字段 + */ + private String extAttrs; + + /** + * 创建时间 + */ + private LocalDateTime createDt; + + /** + * 修改时间 + */ + private LocalDateTime updateDt; + + +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobBatchService.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobBatchService.java new file mode 100644 index 00000000..72871140 --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobBatchService.java @@ -0,0 +1,19 @@ +package com.aizuda.easy.retry.server.web.service; + +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.JobBatchQueryVO; +import com.aizuda.easy.retry.server.web.model.response.JobBatchResponseVO; + +import java.util.List; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 09:54 + * @since ：2.4.0 + */ +public interface JobBatchService { + + PageResult> getJobBatchPage(JobBatchQueryVO jobQueryVO); + + JobBatchResponseVO getJobBatchDetail(Long id); +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobLogService.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobLogService.java new file mode 100644 index 00000000..2fdbea0c --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobLogService.java @@ -0,0 +1,17 @@ +package com.aizuda.easy.retry.server.web.service; + +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.JobLogQueryVO; +import com.aizuda.easy.retry.server.web.model.response.JobLogResponseVO; + +import java.util.List; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 09:54 + * @since ：2.4.0 + */ +public interface JobLogService { + + PageResult> getJobLogPage(JobLogQueryVO jobQueryVO); +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobService.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobService.java index 47d3e90d..0fd0021f 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobService.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobService.java @@ -15,10 +15,10 @@ import java.util.List; public interface JobService { PageResult> getJobPage(JobQueryVO jobQueryVO); - PageResult> getJobDetail(Long id); + JobResponseVO getJobDetail(Long id); - PageResult> saveJob(JobRequestVO jobRequestVO); + boolean saveJob(JobRequestVO jobRequestVO); - PageResult> updateJob(JobRequestVO jobRequestVO); + boolean updateJob(JobRequestVO jobRequestVO); } diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobTaskService.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobTaskService.java new file mode 100644 index 00000000..d323472a --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/JobTaskService.java @@ -0,0 +1,17 @@ +package com.aizuda.easy.retry.server.web.service; + +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.JobTaskQueryVO; +import com.aizuda.easy.retry.server.web.model.response.JobTaskResponseVO; + +import java.util.List; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 09:54 + * @since ：2.4.0 + */ +public interface JobTaskService { + + PageResult> getJobTaskPage(JobTaskQueryVO jobTaskQueryVO); +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobBatchResponseVOConverter.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobBatchResponseVOConverter.java new file mode 100644 index 00000000..78a7ea83 --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobBatchResponseVOConverter.java @@ -0,0 +1,23 @@ +package com.aizuda.easy.retry.server.web.service.convert; + +import com.aizuda.easy.retry.server.web.model.response.JobBatchResponseVO; +import com.aizuda.easy.retry.template.datasource.persistence.po.JobTaskBatch; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * @author: shuguang.zhang + * @date : 2023-10-12 10:23 + * @since : 2.4.0 + */ +@Mapper +public interface JobBatchResponseVOConverter { + + JobBatchResponseVOConverter INSTANCE = Mappers.getMapper(JobBatchResponseVOConverter.class); + + List toJobBatchResponseVOs(List jobBatches); + + JobBatchResponseVO toJobBatchResponseVO(JobTaskBatch jobBatch); +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobConverter.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobConverter.java new file mode 100644 index 00000000..25461a84 --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobConverter.java @@ -0,0 +1,20 @@ +package com.aizuda.easy.retry.server.web.service.convert; + +import com.aizuda.easy.retry.server.web.model.request.JobRequestVO; +import com.aizuda.easy.retry.template.datasource.persistence.po.Job; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 09:40 + * @since : 2.4.0 + */ +@Mapper +public interface JobConverter { + + JobConverter INSTANCE = Mappers.getMapper(JobConverter.class); + + Job toJob(JobRequestVO jobRequestVO); + +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobLogResponseVOConverter.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobLogResponseVOConverter.java new file mode 100644 index 00000000..2c3c7393 --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobLogResponseVOConverter.java @@ -0,0 +1,21 @@ +package com.aizuda.easy.retry.server.web.service.convert; + +import com.aizuda.easy.retry.server.web.model.response.JobLogResponseVO; +import com.aizuda.easy.retry.template.datasource.persistence.po.JobLogMessage; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 11:27 + * @since : 2.4.0 + */ +@Mapper +public interface JobLogResponseVOConverter { + JobLogResponseVOConverter INSTANCE = Mappers.getMapper(JobLogResponseVOConverter.class); + + List toJobLogResponseVOs(List jobLogMessages); + +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobResponseVOConverter.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobResponseVOConverter.java index 8a194df5..c70a9bd6 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobResponseVOConverter.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobResponseVOConverter.java @@ -18,4 +18,6 @@ public interface JobResponseVOConverter { JobResponseVOConverter INSTANCE = Mappers.getMapper(JobResponseVOConverter.class); List toJobResponseVOs(List jobs); + + JobResponseVO toJobResponseVO(Job job); } diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobTaskResponseVOConverter.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobTaskResponseVOConverter.java new file mode 100644 index 00000000..4e3d241d --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/convert/JobTaskResponseVOConverter.java @@ -0,0 +1,21 @@ +package com.aizuda.easy.retry.server.web.service.convert; + +import com.aizuda.easy.retry.server.web.model.response.JobTaskResponseVO; +import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 10:45 + * @since : 2.4.0 + */ +@Mapper +public interface JobTaskResponseVOConverter { + + JobTaskResponseVOConverter INSTANCE = Mappers.getMapper(JobTaskResponseVOConverter.class); + + List toJobTaskResponseVOs(List jobTasks); +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobBatchServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobBatchServiceImpl.java new file mode 100644 index 00000000..59a7fc08 --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobBatchServiceImpl.java @@ -0,0 +1,52 @@ +package com.aizuda.easy.retry.server.web.service.impl; + +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.JobBatchQueryVO; +import com.aizuda.easy.retry.server.web.model.response.JobBatchResponseVO; +import com.aizuda.easy.retry.server.web.service.JobBatchService; +import com.aizuda.easy.retry.server.web.service.convert.JobBatchResponseVOConverter; +import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskBatchMapper; +import com.aizuda.easy.retry.template.datasource.persistence.po.JobTaskBatch; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 09:55 + * @since ：2.4.0 + */ +@Service +public class JobBatchServiceImpl implements JobBatchService { + + @Autowired + private JobTaskBatchMapper jobTaskBatchMapper; + + @Override + public PageResult> getJobBatchPage(final JobBatchQueryVO queryVO) { + + PageDTO pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize()); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (Objects.nonNull(queryVO.getJobId())) { + queryWrapper.eq(JobTaskBatch::getJobId, queryVO.getJobId()); + } + + PageDTO selectPage = jobTaskBatchMapper.selectPage(pageDTO, queryWrapper); + + List batchResponseVOList = JobBatchResponseVOConverter.INSTANCE.toJobBatchResponseVOs( + selectPage.getRecords()); + + return new PageResult<>(pageDTO, batchResponseVOList); + } + + @Override + public JobBatchResponseVO getJobBatchDetail(final Long id) { + JobTaskBatch jobTaskBatch = jobTaskBatchMapper.selectById(id); + return JobBatchResponseVOConverter.INSTANCE.toJobBatchResponseVO(jobTaskBatch); + } +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobLogServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobLogServiceImpl.java new file mode 100644 index 00000000..e2d1e03d --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobLogServiceImpl.java @@ -0,0 +1,39 @@ +package com.aizuda.easy.retry.server.web.service.impl; + +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.JobLogQueryVO; +import com.aizuda.easy.retry.server.web.model.response.JobLogResponseVO; +import com.aizuda.easy.retry.server.web.service.JobLogService; +import com.aizuda.easy.retry.server.web.service.convert.JobLogResponseVOConverter; +import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobLogMessageMapper; +import com.aizuda.easy.retry.template.datasource.persistence.po.JobLogMessage; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 09:55 + * @since ：2.4.0 + */ +@Service +public class JobLogServiceImpl implements JobLogService { + + @Autowired + private JobLogMessageMapper jobLogMessageMapper; + + @Override + public PageResult> getJobLogPage(final JobLogQueryVO queryVO) { + + PageDTO pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize()); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + PageDTO selectPage = jobLogMessageMapper.selectPage(pageDTO, queryWrapper); + + return new PageResult<>(pageDTO, JobLogResponseVOConverter.INSTANCE.toJobLogResponseVOs(selectPage.getRecords())); + } +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobServiceImpl.java index c850c3eb..b4a22d60 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobServiceImpl.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobServiceImpl.java @@ -1,14 +1,17 @@ package com.aizuda.easy.retry.server.web.service.impl; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.StrUtil; +import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; import com.aizuda.easy.retry.server.web.model.base.PageResult; import com.aizuda.easy.retry.server.web.model.request.JobQueryVO; import com.aizuda.easy.retry.server.web.model.request.JobRequestVO; import com.aizuda.easy.retry.server.web.model.response.JobResponseVO; import com.aizuda.easy.retry.server.web.service.JobService; +import com.aizuda.easy.retry.server.web.service.convert.JobConverter; import com.aizuda.easy.retry.server.web.service.convert.JobResponseVOConverter; import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.Job; -import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +36,14 @@ public class JobServiceImpl implements JobService { PageDTO pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StrUtil.isNotBlank(queryVO.getGroupName())) { + queryWrapper.eq(Job::getGroupName, queryVO.getGroupName()); + } + + if (StrUtil.isNotBlank(queryVO.getJobName())) { + queryWrapper.eq(Job::getJobName, queryVO.getJobName()); + } + PageDTO selectPage = jobMapper.selectPage(pageDTO, queryWrapper); List jobResponseList = JobResponseVOConverter.INSTANCE.toJobResponseVOs(selectPage.getRecords()); @@ -41,17 +52,23 @@ public class JobServiceImpl implements JobService { } @Override - public PageResult> getJobDetail(Long id) { - return null; + public JobResponseVO getJobDetail(Long id) { + + Job job = jobMapper.selectById(id); + return JobResponseVOConverter.INSTANCE.toJobResponseVO(job); } @Override - public PageResult> saveJob(JobRequestVO jobRequestVO) { - return null; + public boolean saveJob(JobRequestVO jobRequestVO) { + Job job = JobConverter.INSTANCE.toJob(jobRequestVO); + return 1 == jobMapper.insert(job); } @Override - public PageResult> updateJob(JobRequestVO jobRequestVO) { - return null; + public boolean updateJob(JobRequestVO jobRequestVO) { + Assert.notNull(jobRequestVO.getId(), () -> new EasyRetryServerException("id 不能为空")); + Assert.isTrue(1 == jobMapper.selectCount(new LambdaQueryWrapper().eq(Job::getId, jobRequestVO.getId()))); + Job job = JobConverter.INSTANCE.toJob(jobRequestVO); + return 1 == jobMapper.updateById(job); } } diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobTaskServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobTaskServiceImpl.java new file mode 100644 index 00000000..25f6c2e5 --- /dev/null +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobTaskServiceImpl.java @@ -0,0 +1,50 @@ +package com.aizuda.easy.retry.server.web.service.impl; + +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.JobTaskQueryVO; +import com.aizuda.easy.retry.server.web.model.response.JobTaskResponseVO; +import com.aizuda.easy.retry.server.web.service.JobTaskService; +import com.aizuda.easy.retry.server.web.service.convert.JobTaskResponseVOConverter; +import com.aizuda.easy.retry.template.datasource.persistence.mapper.JobTaskMapper; +import com.aizuda.easy.retry.template.datasource.persistence.po.Job; +import com.aizuda.easy.retry.template.datasource.persistence.po.JobTask; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; + +/** + * @author: www.byteblogs.com + * @date : 2023-10-12 09:55 + * @since ：2.4.0 + */ +@Service +public class JobTaskServiceImpl implements JobTaskService { + + @Autowired + private JobTaskMapper jobTaskMapper; + + @Override + public PageResult> getJobTaskPage(final JobTaskQueryVO queryVO) { + + PageDTO pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize()); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (Objects.nonNull(queryVO.getJobId())) { + queryWrapper.eq(JobTask::getJobId, queryVO.getJobId()); + } + + if (Objects.nonNull(queryVO.getTaskBatchId())) { + queryWrapper.eq(JobTask::getTaskBatchId, queryVO.getTaskBatchId()); + } + + PageDTO selectPage = jobTaskMapper.selectPage(pageDTO, queryWrapper); + + List jobTaskResponseVOs = JobTaskResponseVOConverter.INSTANCE.toJobTaskResponseVOs( + selectPage.getRecords()); + return new PageResult<>(pageDTO, jobTaskResponseVOs); + } +} diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskServiceImpl.java index f53c7a61..ea4ff1f1 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskServiceImpl.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskServiceImpl.java @@ -1,15 +1,11 @@ package com.aizuda.easy.retry.server.web.service.impl; -import akka.actor.ActorRef; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Pair; import cn.hutool.core.util.StrUtil; -import com.aizuda.easy.retry.client.model.DispatchRetryResultDTO; import com.aizuda.easy.retry.client.model.GenerateRetryIdempotentIdDTO; import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; import com.aizuda.easy.retry.common.core.model.Result; import com.aizuda.easy.retry.common.core.util.JsonUtil; -import com.aizuda.easy.retry.server.common.akka.ActorGenerator; import com.aizuda.easy.retry.server.common.dto.RegisterNodeInfo; import com.aizuda.easy.retry.server.common.enums.TaskGeneratorScene; import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum; @@ -17,17 +13,9 @@ import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException; import com.aizuda.easy.retry.server.model.dto.RetryTaskDTO; import com.aizuda.easy.retry.server.retry.task.generator.task.TaskContext; import com.aizuda.easy.retry.server.retry.task.generator.task.TaskGenerator; -import com.aizuda.easy.retry.server.retry.task.support.IdempotentStrategy; -import com.aizuda.easy.retry.server.retry.task.support.WaitStrategy; -import com.aizuda.easy.retry.server.retry.task.support.context.CallbackRetryContext; -import com.aizuda.easy.retry.server.retry.task.support.context.MaxAttemptsPersistenceRetryContext; import com.aizuda.easy.retry.server.common.handler.ClientNodeAllocateHandler; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskActuator; -import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskActuatorSceneEnum; -import com.aizuda.easy.retry.server.retry.task.support.retry.RetryBuilder; -import com.aizuda.easy.retry.server.retry.task.support.retry.RetryExecutor; -import com.aizuda.easy.retry.server.retry.task.support.strategy.FilterStrategies; -import com.aizuda.easy.retry.server.retry.task.support.strategy.StopStrategies; +import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskExecutor; +import com.aizuda.easy.retry.server.retry.task.support.dispatch.task.TaskExecutorSceneEnum; import com.aizuda.easy.retry.server.retry.task.support.strategy.WaitStrategies; import com.aizuda.easy.retry.server.web.model.base.PageResult; import com.aizuda.easy.retry.server.web.model.request.BatchDeleteRetryTaskVO; @@ -49,13 +37,11 @@ import com.aizuda.easy.retry.template.datasource.persistence.mapper.RetryTaskLog import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask; import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTaskLog; import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTaskLogMessage; -import com.aizuda.easy.retry.template.datasource.persistence.po.SceneConfig; import com.aizuda.easy.retry.template.datasource.utils.RequestDataHelper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpEntity; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -97,7 +83,7 @@ public class RetryTaskServiceImpl implements RetryTaskService { @Autowired private List taskGenerators; @Autowired - private List taskActuators; + private List taskExecutors; @Override public PageResult> getRetryTaskPage(RetryTaskQueryVO queryVO) { @@ -329,9 +315,9 @@ public class RetryTaskServiceImpl implements RetryTaskService { for (RetryTask retryTask : list) { - for (TaskActuator taskActuator : taskActuators) { - if (taskActuator.getTaskType().getScene() == TaskActuatorSceneEnum.MANUAL_RETRY.getScene()) { - taskActuator.actuator(retryTask); + for (TaskExecutor taskExecutor : taskExecutors) { + if (taskExecutor.getTaskType().getScene() == TaskExecutorSceneEnum.MANUAL_RETRY.getScene()) { + taskExecutor.actuator(retryTask); } } } @@ -350,9 +336,9 @@ public class RetryTaskServiceImpl implements RetryTaskService { Assert.notEmpty(list, () -> new EasyRetryServerException("没有可执行的任务")); for (RetryTask retryTask : list) { - for (TaskActuator taskActuator : taskActuators) { - if (taskActuator.getTaskType().getScene() == TaskActuatorSceneEnum.MANUAL_CALLBACK.getScene()) { - taskActuator.actuator(retryTask); + for (TaskExecutor taskExecutor : taskExecutors) { + if (taskExecutor.getTaskType().getScene() == TaskExecutorSceneEnum.MANUAL_CALLBACK.getScene()) { + taskExecutor.actuator(retryTask); } } diff --git a/easy-retry-server/easy-retry-server-web/src/main/resources/META-INF/spring.factories b/easy-retry-server/easy-retry-server-web/src/main/resources/META-INF/spring.factories index 3825379c..7e074802 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/resources/META-INF/spring.factories +++ b/easy-retry-server/easy-retry-server-web/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.aizuda.easy.retry.server.web.config.EasyRetryServerWebAutoConfiguration + com.aizuda.easy.retry.server.web.EasyRetryWebStarter