From f5dda0f46c5e8cc061c1ace29d514f19ac23c52d Mon Sep 17 00:00:00 2001 From: "jieying.li" Date: Tue, 29 Oct 2024 20:00:53 +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.=E5=A2=9E=E5=8A=A0=E8=BE=93=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E6=9F=A5=E6=89=BE=E4=BB=BB=E5=8A=A1=E5=9C=A8?= =?UTF-8?q?=E6=9C=89=E6=89=A7=E8=A1=8C=E8=AE=B0=E5=BD=95=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E6=9F=A5=E8=AF=A2=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E6=B2=A1=E6=9C=89=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/AtuPlanTaskApiServiceImpl.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 cb8c86d..0aea0fc 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 @@ -911,6 +911,7 @@ public class AtuPlanTaskApiServiceImpl extends AbstractExcelService TaskCaseStepDetailDto detailDto) { // 获取脚本执行结果信息 Map stepResultMap = new HashMap<>(); + String stepId = ""; if (StrUtil.isNotEmpty(execResultFile)) { // 读取结果文件信息 File file = null; @@ -928,6 +929,12 @@ public class AtuPlanTaskApiServiceImpl extends AbstractExcelService } StepExecuteResult stepExecuteResult = JSONUtil.toBean(line, StepExecuteResult.class); processStepResult(stepExecuteResult, stepResultMap, ""); + if (stepExecuteResult.getStepId() != null && stepExecuteResult.getStepId().startsWith("3e9da7b7c")) { // 用于只输出对应异常数据的详情，可以删除判断，每一个查询进行输出，日志增多而已 + stepId = stepExecuteResult.getStepId(); + stepResultMap.forEach((key, value) -> { + logger.debug("每一步的执行情况：{}，success：{}，isExecuted：{}", key, value.isSuccess(), value.isExecuted()); + }); + } } } catch (Exception e) { logger.error("读取结果文件失败", e); @@ -942,7 +949,13 @@ public class AtuPlanTaskApiServiceImpl extends AbstractExcelService } JSONArray commands = JSONUtil.parseArray(scriptJson.get(MsgConstant.COMMANDS)); - return processStepData(commands, stepResultMap, scriptJson, detailDto, 0, false, false, ""); + List resultList = processStepData(commands, stepResultMap, scriptJson, detailDto, 0, false, false, ""); + if (StringUtils.isNotBlank(stepId)) { + for (TaskCaseStepDetailDto dto : resultList) { // 用于只输出对应异常数据的详情，可以删除判断，每一个查询进行输出，日志增多而已 + logger.debug("步骤id：{}，步骤名称：{}，skip：{}，是否成功：{}，是否已执行：{}", dto.getStepId(), dto.getStepName(), dto.getSkip(), dto.getExecResult(), dto.getExecuted()); + } + } + return resultList; } /**