|
|
|
@ -47,7 +47,7 @@ public class CalcLogServiceImpl extends BaseServiceImpl<CalcLogMapper, CalcLogEn |
|
|
|
private static final Long TIMEOUT_INTERVAL = 1000 * 60 * 60 * 24 * 7L; |
|
|
|
|
|
|
|
/** 计算失败后,计算异常状态下的最大计算次数 */ |
|
|
|
private static final Integer MAX_CALC_COUNT = 5; |
|
|
|
private static final Integer MAX_CALC_COUNT = 50; |
|
|
|
|
|
|
|
@Override |
|
|
|
public QueryWrapper getWrapper(Map<String, Object> params) { |
|
|
|
@ -138,10 +138,10 @@ public class CalcLogServiceImpl extends BaseServiceImpl<CalcLogMapper, CalcLogEn |
|
|
|
.ge(CalcLogEntity::getTime, startTs, Objects.nonNull(startTs)) |
|
|
|
.le(CalcLogEntity::getTime, endTs, Objects.nonNull(endTs)) |
|
|
|
.eq(CalcLogEntity::getStatus, CalcStatus.UN_CALCULATED.getCode()) |
|
|
|
.or( |
|
|
|
CALC_LOG_ENTITY |
|
|
|
.ne(CalcLogEntity::getStatus, 0) |
|
|
|
.or(CALC_LOG_ENTITY |
|
|
|
.STATUS |
|
|
|
.eq(CalcStatus.CALCULATE_EXCEPTION.getCode()) |
|
|
|
.ne(CalcStatus.CALCULATE_EXCEPTION.getCode()) |
|
|
|
.and(CALC_LOG_ENTITY.CALC_COUNT.le(MAX_CALC_COUNT)))); |
|
|
|
} |
|
|
|
|
|
|
|
|