From ef393d13fecb6bf0b86922dfcc764a775cf39908 Mon Sep 17 00:00:00 2001 From: darkmanlee Date: Mon, 6 Jan 2025 19:51:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E6=99=AF-3=E7=9A=84TODO=EF=BC=8C?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E9=94=99=E8=AF=AF=E7=9A=84=E5=A4=A7=E8=87=B4?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/northking/cctp/se/exec/DefaultExecThread.java | 3 ++- .../executePlan/api/service/AtuPlanTaskApiServiceImpl.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cctp-atu/atu-engine/atu-script-engine/src/main/java/net/northking/cctp/se/exec/DefaultExecThread.java b/cctp-atu/atu-engine/atu-script-engine/src/main/java/net/northking/cctp/se/exec/DefaultExecThread.java index 85d55c7..b73e54a 100644 --- a/cctp-atu/atu-engine/atu-script-engine/src/main/java/net/northking/cctp/se/exec/DefaultExecThread.java +++ b/cctp-atu/atu-engine/atu-script-engine/src/main/java/net/northking/cctp/se/exec/DefaultExecThread.java @@ -920,7 +920,7 @@ public class DefaultExecThread implements AtuExecThread{ } try { if (task.getRetryStrategy() != null && AtuExecConstant.TASK_RETRY_STRATEGY_PACKAGE.equals(task.getRetryStrategy())) { // - count = task.getCurrentRetryNum(); + count = task.getCurrentRetryNum(); // TODO: -3 } if(null==executeResult){ if (!this.thread.isInterrupted()) { @@ -994,6 +994,7 @@ public class DefaultExecThread implements AtuExecThread{ } String resultMsg = ""; if(0!=executeResult.getResultStatus()){ + // TODO: 这里的错误信息 resultMsg = "自动重试次数："+count+";"+executeResult.getResultMsg(); } if (!this.thread.isInterrupted()) { 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 75c1ca8..0403be4 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,6 +1288,7 @@ 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); } amqpAdmin.declareQueue(new Queue(queueName));