From 3aa3090fb5d7bf420361b0fca221b5492f72e56a Mon Sep 17 00:00:00 2001 From: "jieying.li" Date: Mon, 11 Nov 2024 16:16:49 +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=201.=E6=8A=8A=E6=94=B6=E5=B0=BE=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=E7=A7=BB=E5=8A=A8=E5=88=B0=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E5=88=A0=E9=99=A4=E7=9A=84=E5=90=8E=E8=BE=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executePlan/job/PlanBatchTaskDataUpdateJob.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/job/PlanBatchTaskDataUpdateJob.java b/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/job/PlanBatchTaskDataUpdateJob.java index 3e9b6a0..65eb5ab 100644 --- a/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/job/PlanBatchTaskDataUpdateJob.java +++ b/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/job/PlanBatchTaskDataUpdateJob.java @@ -235,11 +235,7 @@ public class PlanBatchTaskDataUpdateJob { //获取更新后的批次信息 AtuPlanBatchDetailDto atuPlanBatchDetailDto = planBatchService.queryBatchDetailById(planBatch.getId()); - // 收尾处理 - AtuPlanInfo batchPlanInfo = planInfoService.findByBatchId(batchId); - if (batchPlanInfo != null) { - handleEnd(batchPlanInfo, atuPlanBatchDetailDto); - } + // 判断是否计划最后一批次 AtuPlanInfo planInfo = planInfoService.queryByLastBatchId(batchId); if (ObjectUtil.isNotNull(planInfo)) { @@ -264,6 +260,12 @@ public class PlanBatchTaskDataUpdateJob { // 2.2. 删除缓存中已完成批次的记录 logger.debug("删除批次统计缓存 => " + key); redisTemplate.delete(key); + + // 收尾处理 + AtuPlanInfo batchPlanInfo = planInfoService.findByBatchId(batchId); + if (batchPlanInfo != null) { + handleEnd(batchPlanInfo, atuPlanBatchDetailDto); + } }); logger.debug("同步缓存中计划批次统计数据----end----"); }