gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat(1.4.0-beta1): 修复报表无法统计的问题

Browse Source
This commit is contained in:
xiaochaihu 2025-02-21 00:43:09 +08:00 committed by opensnail
parent 849e68f208
commit 3a6566c532
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryMapper.java
View File

@ -1,6 +1,9 @@
package com.aizuda.snailjob.template.datasource.persistence.mapper;
import com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryResponseDO;
import com.aizuda.snailjob.template.datasource.persistence.po.Retry;
import com.aizuda.snailjob.template.datasource.persistence.po.RetryTask;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@ -12,4 +15,5 @@ public interface RetryMapper extends BaseMapper<Retry> {
int updateBatchNextTriggerAtById(@Param("list") List<Retry> list);
List<DashboardRetryResponseDO> selectRetrySummaryList(@Param("ew") Wrapper<RetryTask> wrapper);
}

6
snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml → snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryMapper.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper">
<mapper namespace="com.aizuda.snailjob.template.datasource.persistence.mapper.RetryMapper">
<select id="selectRetryRetryTaskLogSummaryList"
<select id="selectRetrySummaryList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryResponseDO">
SELECT namespace_id AS namespaceId,
group_name AS groupName,
@ -11,7 +11,7 @@
SUM(CASE WHEN (retry_status = 1) THEN 1 ELSE 0 END) AS finishNum,
SUM(CASE WHEN (retry_status = 2) THEN 1 ELSE 0 END) AS maxCountNum,
SUM(CASE WHEN (retry_status = 3) THEN 1 ELSE 0 END) AS suspendNum
FROM sj_retry_task a
FROM sj_retry a
join (SELECT namespace_id AS namespaceId, group_name AS groupName, scene_name AS sceneName
FROM sj_retry_scene_config) b
on a.namespace_id = b.namespaceId and a.group_name = b.groupName and a.scene_name = b.sceneName

9
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetrySummarySchedule.java
View File

@ -8,8 +8,8 @@ import com.aizuda.snailjob.server.common.config.SystemProperties;
import com.aizuda.snailjob.server.common.schedule.AbstractSchedule;
import com.aizuda.snailjob.server.common.triple.Triple;
import com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryResponseDO;
import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryMapper;
import com.aizuda.snailjob.template.datasource.persistence.mapper.RetrySummaryMapper;
import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskMapper;
import com.aizuda.snailjob.template.datasource.persistence.po.RetrySummary;
import com.aizuda.snailjob.template.datasource.persistence.po.RetryTask;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -34,7 +34,7 @@ import java.util.*;
@Component
@RequiredArgsConstructor
public class RetrySummarySchedule extends AbstractSchedule implements Lifecycle {
private final RetryTaskMapper retryTaskMapper;
private final RetryMapper retryMapper;
private final RetrySummaryMapper retrySummaryMapper;
private final SystemProperties systemProperties;
@ -64,7 +64,7 @@ public class RetrySummarySchedule extends AbstractSchedule implements Lifecycle
LambdaQueryWrapper<RetryTask> wrapper = new LambdaQueryWrapper<RetryTask>()
.between(RetryTask::getCreateDt, todayFrom, todayTo)
.groupBy(RetryTask::getNamespaceId, RetryTask::getGroupName, RetryTask::getSceneName);
List<DashboardRetryResponseDO> dashboardRetryResponseDOList = retryTaskMapper.selectRetryRetryTaskLogSummaryList(wrapper);
List<DashboardRetryResponseDO> dashboardRetryResponseDOList = retryMapper.selectRetrySummaryList(wrapper);
if (CollUtil.isEmpty(dashboardRetryResponseDOList)) {
continue;
}
@ -142,8 +142,7 @@ public class RetrySummarySchedule extends AbstractSchedule implements Lifecycle
@Override
public void start() {
// todo 待处理
// taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1M"));
taskScheduler.scheduleAtFixedRate(this::execute, Duration.parse("PT1M"));
}
@Override