diff --git a/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanTaskApiServiceImpl.java b/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanTaskApiServiceImpl.java index 0403be4..de345dd 100644 --- a/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanTaskApiServiceImpl.java +++ b/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanTaskApiServiceImpl.java @@ -1288,8 +1288,11 @@ public class AtuPlanTaskApiServiceImpl extends AbstractExcelService Object o = redisTemplate.opsForHash().get(RedisConstant.PLAN_BATCH_RETRY_COUNT, atuTaskExecDto.getBatchId()); if (null != o) { int count = Integer.parseInt(o.toString()); - // TODO: 如何是-3 - atuTaskExecDto.setCurrentRetryNum(atuTaskExecDto.getFailRetryNum() - count); + // TODO: 计划执行的时候重试勾选了,导致redis中存在重试次数数据;在后续执行过程中,计划取消了勾选重试次数,导致值为0,出现了负数 + int currentRetryNum = atuTaskExecDto.getFailRetryNum() - count; + if (currentRetryNum > 0) { + atuTaskExecDto.setCurrentRetryNum(currentRetryNum); + } } amqpAdmin.declareQueue(new Queue(queueName)); amqpTemplate.convertAndSend(queueName, JSONUtil.toJsonStr(atuTaskExecDto));