diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/JobLogAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/JobLogAccess.java new file mode 100644 index 000000000..74239c81c --- /dev/null +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/JobLogAccess.java @@ -0,0 +1,5 @@ +package com.aizuda.snailjob.template.datasource.access; + + +public interface JobLogAccess extends LogAccess{ +} diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/RetryLogAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/RetryLogAccess.java new file mode 100644 index 000000000..702c09654 --- /dev/null +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/RetryLogAccess.java @@ -0,0 +1,5 @@ +package com.aizuda.snailjob.template.datasource.access; + + +public interface RetryLogAccess extends LogAccess{ +} diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/AbstractLogAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/AbstractLogAccess.java deleted file mode 100644 index de1214c85..000000000 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/AbstractLogAccess.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.aizuda.snailjob.template.datasource.access.log; - -import com.aizuda.snailjob.template.datasource.access.LogAccess; - -/** - *

- * - *

- * - * @author opensnail - * @date 2025-03-30 - */ -public abstract class AbstractLogAccess implements LogAccess { -} diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/JobLogMessageAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/JobLogMessageAccess.java index d121e0183..6d2d7c089 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/JobLogMessageAccess.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/JobLogMessageAccess.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.template.datasource.access.log; -import com.aizuda.snailjob.template.datasource.access.LogAccess; +import com.aizuda.snailjob.template.datasource.access.JobLogAccess; import com.aizuda.snailjob.template.datasource.enums.DbTypeEnum; import com.aizuda.snailjob.template.datasource.enums.OperationTypeEnum; import com.aizuda.snailjob.template.datasource.persistence.dataobject.common.*; @@ -13,8 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.stereotype.Component; import java.io.Serializable; import java.util.*; @@ -29,11 +27,9 @@ import static com.aizuda.snailjob.template.datasource.utils.DbUtils.getDbType; * @author opensnail * @date 2025-03-30 */ -@Component @Slf4j -//@ConditionalOnMissingBean(LogAccess.class) @RequiredArgsConstructor -public class JobLogMessageAccess extends AbstractLogAccess { +public class JobLogMessageAccess implements JobLogAccess { private final JobLogMessageMapper jobLogMessageMapper; private final JobTaskBatchMapper jobTaskBatchMapper; diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/RetryTaskLogMessageAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/RetryTaskLogMessageAccess.java index 457091a7e..709d56033 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/RetryTaskLogMessageAccess.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/RetryTaskLogMessageAccess.java @@ -1,5 +1,6 @@ package com.aizuda.snailjob.template.datasource.access.log; +import com.aizuda.snailjob.template.datasource.access.RetryLogAccess; import com.aizuda.snailjob.template.datasource.enums.DbTypeEnum; import com.aizuda.snailjob.template.datasource.enums.OperationTypeEnum; import com.aizuda.snailjob.template.datasource.persistence.dataobject.common.*; @@ -20,8 +21,7 @@ import static com.aizuda.snailjob.template.datasource.utils.DbUtils.getDbType; * @author opensnail * @date 2025-03-29 */ -@Component -public class RetryTaskLogMessageAccess extends AbstractLogAccess { +public class RetryTaskLogMessageAccess implements RetryLogAccess { @Override diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/config/LogConfig.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/config/LogConfig.java new file mode 100644 index 000000000..3c93f620a --- /dev/null +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/log/config/LogConfig.java @@ -0,0 +1,29 @@ +package com.aizuda.snailjob.template.datasource.access.log.config; + +import com.aizuda.snailjob.template.datasource.access.JobLogAccess; +import com.aizuda.snailjob.template.datasource.access.RetryLogAccess; +import com.aizuda.snailjob.template.datasource.access.log.JobLogMessageAccess; +import com.aizuda.snailjob.template.datasource.access.log.RetryTaskLogMessageAccess; +import com.aizuda.snailjob.template.datasource.persistence.dataobject.log.JobLogMessageDO; +import com.aizuda.snailjob.template.datasource.persistence.dataobject.log.RetryTaskLogMessageDO; +import com.aizuda.snailjob.template.datasource.persistence.mapper.JobLogMessageMapper; +import com.aizuda.snailjob.template.datasource.persistence.mapper.JobTaskBatchMapper; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class LogConfig { + + @ConditionalOnMissingBean + @Bean + public JobLogAccess defaultJobLogAccess(JobLogMessageMapper jobLogMessageMapper, JobTaskBatchMapper jobTaskBatchMapper) { + return new JobLogMessageAccess(jobLogMessageMapper, jobTaskBatchMapper); + } + + @ConditionalOnMissingBean + @Bean + public RetryLogAccess defaultRetryLogAccess() { + return new RetryTaskLogMessageAccess(); + } +}