From b975c4ae193c518b1826b69e119fc30ed0bb4d9d Mon Sep 17 00:00:00 2001 From: lishuai Date: Tue, 4 Mar 2025 20:48:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=202025?= =?UTF-8?q?=E5=B9=B43=E6=9C=884=E6=97=A520:48:48?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/thing/calculation/handler/CalcExecuteHandler.java | 5 ++++- .../service/impl/CalcTargetConfigServiceImpl.java | 2 +- .../src/main/java/com/thing/quartz/calc/task/CalcTask.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/calculation/src/main/java/com/thing/calculation/handler/CalcExecuteHandler.java b/modules/calculation/src/main/java/com/thing/calculation/handler/CalcExecuteHandler.java index bba8dac..40ee97a 100644 --- a/modules/calculation/src/main/java/com/thing/calculation/handler/CalcExecuteHandler.java +++ b/modules/calculation/src/main/java/com/thing/calculation/handler/CalcExecuteHandler.java @@ -50,7 +50,7 @@ public class CalcExecuteHandler { * * @param request 计算请求 */ - public void handleCalculate(ExecuteCalcRequest request) { + public void handleCalculate(ExecuteCalcRequest request,List ids) { long calcStart = System.currentTimeMillis(); // 清理过期日志:7天 calcLogService.clearExpiredCalculatedLog(); @@ -59,6 +59,9 @@ public class CalcExecuteHandler { if (CollectionUtils.isEmpty(targetConfigs)) { return; } + if(!CollectionUtils.isEmpty(ids)){ + targetConfigs = targetConfigs.stream().filter(config -> ids.contains(config.getId())).toList(); + } // 按照结果对象的id分组 Map configMap = targetConfigs.stream() diff --git a/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcTargetConfigServiceImpl.java b/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcTargetConfigServiceImpl.java index e49eeb5..574db34 100644 --- a/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcTargetConfigServiceImpl.java +++ b/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcTargetConfigServiceImpl.java @@ -357,7 +357,7 @@ public class CalcTargetConfigServiceImpl calcLogSaveHandler.handleLogSave(tskvList, configList, true); // 立即执行计算 - calcExecuteHandler.handleCalculate(new ExecuteCalcRequest(request.getStartTime(), request.getEndTime())); + calcExecuteHandler.handleCalculate(new ExecuteCalcRequest(request.getStartTime(), request.getEndTime()),ids); } @Override diff --git a/modules/quartz/src/main/java/com/thing/quartz/calc/task/CalcTask.java b/modules/quartz/src/main/java/com/thing/quartz/calc/task/CalcTask.java index e608344..d9298ac 100644 --- a/modules/quartz/src/main/java/com/thing/quartz/calc/task/CalcTask.java +++ b/modules/quartz/src/main/java/com/thing/quartz/calc/task/CalcTask.java @@ -31,6 +31,6 @@ public class CalcTask implements ITask { } else { request = JSONObject.parseObject(params, ExecuteCalcRequest.class); } - calcExecuteHandler.handleCalculate(request); + calcExecuteHandler.handleCalculate(request,null); } }