yineng.huang
/
hz
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：执行计划 

1.增加输出，用于查找任务在有执行记录的情况下，查询详情的时候没有展示信息。
master
李杰应 2024-10-29 20:00:53 +08:00
parent 8666c2cf92
commit f5dda0f46c
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/api/service/AtuPlanTaskApiServiceImpl.java
View File

@ -911,6 +911,7 @@ public class AtuPlanTaskApiServiceImpl extends AbstractExcelService<AtuPlanTask>
TaskCaseStepDetailDto detailDto) { TaskCaseStepDetailDto detailDto) {
// 获取脚本执行结果信息 // 获取脚本执行结果信息
Map<String, StepExecuteResult> stepResultMap = new HashMap<>(); Map<String, StepExecuteResult> stepResultMap = new HashMap<>();
String stepId = "";
if (StrUtil.isNotEmpty(execResultFile)) { if (StrUtil.isNotEmpty(execResultFile)) {
// 读取结果文件信息 // 读取结果文件信息
File file = null; File file = null;
@ -928,6 +929,12 @@ public class AtuPlanTaskApiServiceImpl extends AbstractExcelService<AtuPlanTask>
} }
StepExecuteResult stepExecuteResult = JSONUtil.toBean(line, StepExecuteResult.class); StepExecuteResult stepExecuteResult = JSONUtil.toBean(line, StepExecuteResult.class);
processStepResult(stepExecuteResult, stepResultMap, ""); 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) { } catch (Exception e) {
logger.error("读取结果文件失败", e); logger.error("读取结果文件失败", e);
@ -942,7 +949,13 @@ public class AtuPlanTaskApiServiceImpl extends AbstractExcelService<AtuPlanTask>
} }
JSONArray commands = JSONUtil.parseArray(scriptJson.get(MsgConstant.COMMANDS)); JSONArray commands = JSONUtil.parseArray(scriptJson.get(MsgConstant.COMMANDS));
return processStepData(commands, stepResultMap, scriptJson, detailDto, 0, false, false, ""); List<TaskCaseStepDetailDto> 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;
} }
/** /**