diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/RetryTaskConverter.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/RetryTaskConverter.java index 6c73eead0..f2c18d4a1 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/RetryTaskConverter.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/RetryTaskConverter.java @@ -15,6 +15,7 @@ import com.aizuda.snailjob.server.retry.task.dto.RetryTaskGeneratorDTO; import com.aizuda.snailjob.server.retry.task.support.block.BlockStrategyContext; import com.aizuda.snailjob.server.retry.task.support.result.RetryResultContext; import com.aizuda.snailjob.server.retry.task.support.timer.RetryTimerContext; +import com.aizuda.snailjob.template.datasource.persistence.dataobject.log.RetryTaskLogMessageDO; import com.aizuda.snailjob.template.datasource.persistence.po.*; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -87,7 +88,7 @@ public interface RetryTaskConverter { return new HashSet<>(JsonUtil.parseList(notifyRecipientIdsStr, Long.class)); } - RetryTaskLogMessage toRetryTaskLogMessage(RetryLogTaskDTO retryLogTaskDTO); + RetryTaskLogMessageDO toRetryTaskLogMessage(RetryLogTaskDTO retryLogTaskDTO); @Mapping(target = "timestamp", expression = "java(DateUtils.toNowMilli())") RetryLogMetaDTO toLogMetaDTO(Retry retry); diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryLogActor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryLogActor.java index 2d0a20f69..8964761a4 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryLogActor.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryLogActor.java @@ -1,5 +1,7 @@ package com.aizuda.snailjob.server.retry.task.support.dispatch; +import com.aizuda.snailjob.template.datasource.access.AccessTemplate; +import com.aizuda.snailjob.template.datasource.persistence.dataobject.log.RetryTaskLogMessageDO; import org.apache.pekko.actor.AbstractActor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -31,7 +33,7 @@ import java.util.stream.Collectors; @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) @RequiredArgsConstructor public class RetryLogActor extends AbstractActor { - private final RetryTaskLogMessageMapper retryTaskLogMessageMapper; + private final AccessTemplate accessTemplate; @Override public Receive createReceive() { @@ -54,9 +56,9 @@ public class RetryLogActor extends AbstractActor { List jobLogTasks = list; Map> logTaskDTOMap = jobLogTasks. stream().collect(Collectors.groupingBy(RetryLogTaskDTO::getRetryTaskId, Collectors.toList())); - List retryTaskLogMessages = new ArrayList<>(); + List retryTaskLogMessages = new ArrayList<>(); for (List logTaskDTOList : logTaskDTOMap.values()) { - RetryTaskLogMessage retryTaskLogMessage = RetryTaskConverter.INSTANCE.toRetryTaskLogMessage( + RetryTaskLogMessageDO retryTaskLogMessage = RetryTaskConverter.INSTANCE.toRetryTaskLogMessage( logTaskDTOList.get(0)); retryTaskLogMessage.setCreateDt(LocalDateTime.now()); retryTaskLogMessage.setLogNum(logTaskDTOList.size()); @@ -70,7 +72,7 @@ public class RetryLogActor extends AbstractActor { retryTaskLogMessages.add(retryTaskLogMessage); } - retryTaskLogMessageMapper.insertBatch(retryTaskLogMessages); + accessTemplate.getRetryTaskLogMessageAccess().insertBatch(retryTaskLogMessages); } /** @@ -79,7 +81,7 @@ public class RetryLogActor extends AbstractActor { private void saveRetryTaskLogMessage(final RetryTaskLogDTO retryTaskLogDTO) { // 记录重试日志 - RetryTaskLogMessage retryTaskLogMessage = new RetryTaskLogMessage(); + RetryTaskLogMessageDO retryTaskLogMessage = new RetryTaskLogMessageDO(); retryTaskLogMessage.setRetryId(retryTaskLogDTO.getRetryId()); retryTaskLogMessage.setRetryTaskId(retryTaskLogDTO.getRetryTaskId()); retryTaskLogMessage.setGroupName(retryTaskLogDTO.getGroupName()); @@ -90,7 +92,7 @@ public class RetryLogActor extends AbstractActor { retryTaskLogMessage.setMessage( StrUtil.isBlank(errorMessage) ? StrUtil.EMPTY : errorMessage); retryTaskLogMessage.setCreateDt(Optional.ofNullable(retryTaskLogDTO.getTriggerTime()).orElse(LocalDateTime.now())); - retryTaskLogMessageMapper.insert(retryTaskLogMessage); + accessTemplate.getRetryTaskLogMessageAccess().insert(retryTaskLogMessage); } }