From 5d95eda5462d5f693691085e6889301abfa04426 Mon Sep 17 00:00:00 2001 From: darkmanlee Date: Tue, 7 Jan 2025 14:20:19 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=89=A7=E8=A1=8C=E8=AE=A1?= =?UTF-8?q?=E5=88=92=20=E9=97=AE=E9=A2=98=EF=BC=9A=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=9A=84=E6=97=B6=E5=80=99=E9=87=8D=E8=AF=95?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E4=BA=86=EF=BC=8C=E5=AF=BC=E8=87=B4redis?= =?UTF-8?q?=E4=B8=AD=E5=AD=98=E5=9C=A8=E9=87=8D=E8=AF=95=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=9B=E5=9C=A8=E5=90=8E=E7=BB=AD=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E8=BF=87=E7=A8=8B=E4=B8=AD=EF=BC=8C=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BA=86=E5=8B=BE=E9=80=89=E9=87=8D=E8=AF=95?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=80=BC=E4=B8=BA?= =?UTF-8?q?0=EF=BC=8C=E5=BD=93=E5=89=8D=E5=BE=AA=E7=8E=AF=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E5=87=BA=E7=8E=B0=E8=B4=9F=E6=95=B0=20=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=E8=A7=A3=E5=86=B3=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=80=BC?= =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E8=B4=9F=E6=95=B0=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E6=AC=A1=E6=95=B0=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executePlan/api/service/AtuPlanTaskApiServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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));